git-gui: Correctly ignore '* Unmerged path' during diff.
-rwxr-xr-x 745 GIT-VERSION-GEN
-rw-r--r-- 1200 Makefile
-rw-r--r-- 1948 TODO
-rwxr-xr-x 101921 git-gui.sh