git-gui: Improve the display of merge conflicts.
-rwxr-xr-x 745 GIT-VERSION-GEN
-rw-r--r-- 1200 Makefile
-rw-r--r-- 1948 TODO
-rwxr-xr-x 99830 git-gui.sh