t / t5100 / msg0006on commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   1Here is a patch from A U Thor.
   2