diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2007-10-18 12:25:34 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 19:59:58 -0400 |
| commit | d279fc1a76bf9bfeedded1a1c8ebcfc8779f5b10 (patch) | |
| tree | 9babddc79be1a1b796648945d235137f0a0ceab0 /git-mergetool.sh | |
| parent | ca8e6b7a55bfeccbd08182205102d44874f787b6 (diff) | |
| download | git-d279fc1a76bf9bfeedded1a1c8ebcfc8779f5b10.tar.gz | |
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>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 94511f9d1a..a68b40386b 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -334,7 +334,7 @@ init_merge_tool_path() { if test -z "$merge_tool"; then merge_tool=`git config merge.tool` - if ! valid_tool "$merge_tool"; then + if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." unset merge_tool |