merge-one-file: force content conflict for "both sides added" case
[git] / t / test-binary-2.png
t/test-binary-2.png