merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 321995 gitk
drwxr-xr-x - po