Clarify kind of conflict in merge-one-file helper
[git] / t / t5100 / patch0008