t / t5100 / msg0001on commit Document git-merge-file (9abaa7f)
   1Here is a patch from A U Thor.
   2