merge-recursive: Fix multiple file rename across D/F conflict
[git] / t / t9603 / cvsroot / CVSROOT /
drwxr-xr-x   ..
-rw-r--r-- 17 .gitignore