t / t5100 / msg0006on commit git merge -X<option> (8cc5b29)
   1Here is a patch from A U Thor.
   2