RelNoteson commit mergetool: avoid misleading message "Resetting to default..." (d279fc1)
   1Documentation/RelNotes-1.5.4.txt