RelNoteson commit checkout -m --conflict=diff3: add a label for ancestor (c415162)
   1Documentation/RelNotes-1.7.1.txt