RelNoteson commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1Documentation/RelNotes/1.7.0.9.txt