Code

git-gui: Don't allow merges in the middle of other things.
-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 122174 git-gui.sh