git-gui: Improve handling of merge commits.