merge-file --diff3: add a label for ancestor
[git] / RelNotes
1 Documentation/RelNotes-1.7.1.txt