t / t5100 / msg0008on commit Clarify kind of conflict in merge-one-file helper (adfd55d)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4