merge-one-file: force content conflict for "both sides added" case
[git] / t / t9126 /
drwxr-xr-x   ..
-rw-r--r-- 2355 follow-deleted-readded.dump