merge-recursive: Fix multiple file rename across D/F conflict
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 4627 test.pl