git-gui: Improve diff --cc viewing for unmerged files.
tree9acdf2f3301f47bd584739516c256bed6b4fd0e6
-rw-r--r-- 36 .gitignore
-rwxr-xr-x 745 GIT-VERSION-GEN
-rw-r--r-- 1200 Makefile
-rw-r--r-- 1948 TODO
-rwxr-xr-x 100605 git-gui.sh