git-gui: Improve the display of merge conflicts.
tree4c764402619808c1815dd4ab3fb549320fa5ebbb
-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 99830 git-gui.sh