merge-recursive: Fix multiple file rename across D/F conflict
[gitweb.git] / t / t9121 /
drwxr-xr-x   parent (dest: t; base: ae74548)
-rw-r--r-- 1046 renamed-dir.dump