merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11623 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 94314 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows