rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: bd7dfa543e0263858071b8648a55ef7ccae1085b)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11817 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 102062 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows