merge-recursive: Fix multiple file rename across D/F conflict
[git] / t / t9602 / cvsroot / module / sub3 /
drwxr-xr-x   ..
-rw-r--r-- 1579 default,v