diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 09:46:31 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 12:29:48 -0400 |
| commit | b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8 (patch) | |
| tree | 45fc1e19dc2dc0af45265f7394af4ca0efdff7e4 /git-mergetool.sh | |
| parent | ddc0c49753001d2b5da4df7df2d42378c8c3a295 (diff) | |
| download | git-b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8.tar.gz | |
mergetool: Remove spurious error message if merge.tool config option not set
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
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 1355fcb19f..c1fde41a08 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -280,7 +280,7 @@ done if test -z "$merge_tool"; then merge_tool=`git-config merge.tool` case "$merge_tool" in - kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff) + kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff | "") ;; # happy *) echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" |