mergetool: avoid misleading message "Resetting to default..."
[git] / RelNotes
1 Documentation/RelNotes-1.5.4.txt