t / t5100 / rfc2047-info-0005on commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1Subject: (a)
   2