projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddc0c49
)
mergetool: Remove spurious error message if merge.tool config option not set
author
Theodore Ts'o
<tytso@mit.edu>
Thu, 29 Mar 2007 13:46:31 +0000
(09:46 -0400)
committer
Theodore Ts'o
<tytso@mit.edu>
Thu, 29 Mar 2007 16:29:48 +0000
(12:29 -0400)
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh
patch
|
blob
|
history
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index 1355fcb19f8120fffef3009a2fdc6534ef14e4cc..c1fde41a08d296e2647428242490b0b603618d48 100755
(executable)
--- 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"