Keep rename/rename conflicts of intermediate merges while doing recursive merge
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: a97e4075a16e0cbdf9c4aed736b5e762e035508b)
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 1612 Makefile
-rwxr-xr-x 149034 git-gui.sh