Code

git-gui: Minor refactoring of merge command line in merge support