git-gui: Warn users before making an octopus merge
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 1751 Makefile
-rwxr-xr-x 151171 git-gui.sh