RelNoteson commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1Documentation/RelNotes-1.6.0.1.txt