merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t9603 / cvsroot / module /
drwxr-xr-x   parent (dest: t/t9603/cvsroot; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rw-r--r-- 589 a,v
-rw-r--r-- 703 b,v