git-gui: Minor refactoring of merge command line in merge support
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 4756 Makefile
-rwxr-xr-x 64773 git-gui.sh
drwxr-xr-x - lib