git-gui: Enable resolution of merge conflicts.
treef72f756978322cc4b31fd91e30b2ee45672bd6e9
-rw-r--r-- 463 Makefile
-rw-r--r-- 1948 TODO
lrwxrwxrwx 7 git-citool -> git-gui
-rwxr-xr-x 89400 git-gui