t / t5100 / msg0006on commit mergetool: avoid misleading message "Resetting to default..." (d279fc1)
   1Here is a patch from A U Thor.
   2