git-gui: Allow git-merge to use branch names in conflict markers