Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
SubmittingPatches: explain rationale for using --notes with format-patch
[gitweb.git]
/
git-mergetool--lib.sh
diff --git
a/git-mergetool--lib.sh
b/git-mergetool--lib.sh
index cce4f8c4945732daa0e1ca28cefb0ff4ed2fbbfc..2b6635130a6c6e80cd8d188ae611bf220d25bc0a 100644
(file)
--- a/
git-mergetool--lib.sh
+++ b/
git-mergetool--lib.sh
@@
-251,7
+251,7
@@
list_merge_tool_candidates () {
tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
fi
tools="$tools gvimdiff diffuse diffmerge ecmerge"
- tools="$tools p4merge araxis bc
3
codecompare"
+ tools="$tools p4merge araxis bc codecompare"
fi
case "${VISUAL:-$EDITOR}" in
*vim*)