git-gui: Don't allow users to commit a bad octopus merge.
treeb2c77682237b3c204b43d502746f19a2c39304d7
-rw-r--r-- 36 .gitignore
-rwxr-xr-x 745 GIT-VERSION-GEN
-rw-r--r-- 1200 Makefile
-rw-r--r-- 1659 TODO
-rwxr-xr-x 121865 git-gui.sh