t / t5100 / emptyon commit Clarify kind of conflict in merge-one-file helper (adfd55d)
   1