mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool: Remove spurious error message if merge.tool config option not set

Browse Source 
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o
2007-03-29 09:46:31 -04:00
parent ddc0c49753
commit b7b36f92fd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-mergetool.sh
View File

@ -280,7 +280,7 @@ done
if test -z "$merge_tool"; then if test -z "$merge_tool"; then
merge_tool=`git-config merge.tool` merge_tool=`git-config merge.tool`
case "$merge_tool" in case "$merge_tool" in
kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff) kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff | "")
;; # happy ;; # happy
*) *)
echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"