Code

mergetool: avoid misleading message "Resetting to default..."