merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t9601 /
drwxr-xr-x   parent (dest: t; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
drwxr-xr-x - cvsroot