git-gui: Improve the display of merge conflicts.