RelNoteson commit tests: document format of conflicts from checkout -m (47349a8)
   1Documentation/RelNotes-1.7.1.txt