t / t5100 / msg0016on commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1and some content
   2