traverse_trees(): handle D/F conflict case sanely
[gitweb.git] / t / t9151 /
drwxr-xr-x   parent (dest: t; base: 1ee26571e97c64bccecfd26d1a1c1c631412a1b7)
-rw-r--r-- 4162 make-svnmerge-dump
-rw-r--r-- 37673 svn-mergeinfo.dump