t / t5100 / msg0001on commit Use merge-recursive in git-checkout -m (branch switching) (c1a4278)
   1Here is a patch from A U Thor.
   2