t / t5100 / msg0001on commit Clarify kind of conflict in merge-one-file helper (adfd55d)
   1Here is a patch from A U Thor.
   2