merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: b26d87f2da22a5970b15bebe588bcd6ccac98e9b)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11731 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 101586 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows