git-gui: Support resolving conflicts via the diff context menu.
tree4c0daf23d73190a2419c6b1732921a31cf09f861
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11322 Makefile
-rwxr-xr-x 76369 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows