RelNoteson commit Merge branch 'jk/two-way-merge-corner-case-fix' (3979580)
   1Documentation/RelNotes/1.8.5.txt