t / t5100 / msg0006on commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1Here is a patch from A U Thor.
   2