contrib/ChangeLog: * gcc-changelog/git_update_version.py: Support merge commits and walk only on the branch that is being merged and generate missing ChangeLog entries.