git-gui: Simplify error case for unsupported merge types
tree8d9b348eb4f6e7a644b31ce3a08ab06af00a9347
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 4756 Makefile
-rwxr-xr-x 65911 git-gui.sh
drwxr-xr-x - lib