RelNoteson commit Merge branch 'jc/better-conflict-resolution' (9ba929e)
   1Documentation/RelNotes-1.6.1.txt