@matheusbsbs / matheus-bagliano / commits / d279fc1a76
Fork 0

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

If no mergetool is configured in the configuration variable merge.tool the resetting message should not be printed. This is fixed. The message is only printed if a tool is configured but the entry in merge.tool is invalid. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Steffen Prohaska committed Oct 18, 2007 at 12:25 UTC d279fc1a76bf9bfeedded1a1c8ebcfc8779f5b10
1 file changed +1 -1
git-mergetool.sh
+1 -1
@@ -334,7 +334,7 @@ init_merge_tool_path() {
334
335 if test -z "$merge_tool"; then
336 merge_tool=`git config merge.tool`
337 - if ! valid_tool "$merge_tool"; then
337 + if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then
338 echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
339 echo >&2 "Resetting to default..."
340 unset merge_tool