merge-recursive: handle D/F conflict case more carefully.
[git] / contrib / fast-import /
drwxr-xr-x   ..
-rwxr-xr-x 2655 import-tars.perl