merge-one-file: force content conflict for "both sides added" case
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 5483 test.pl