Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
fast-export: make extra_refs global
[gitweb.git]
/
git-mergetool--lib.sh
diff --git
a/git-mergetool--lib.sh
b/git-mergetool--lib.sh
index 6a721064c288609fde50fc84e963519ceb00723e..feee6a4a0d3a970c94fe506070ddc497c4b40658 100644
(file)
--- a/
git-mergetool--lib.sh
+++ b/
git-mergetool--lib.sh
@@
-144,7
+144,7
@@
setup_user_tool () {
setup_tool () {
tool="$1"
- # Fallback definitions, to be overriden by tools.
+ # Fallback definitions, to be overrid
d
en by tools.
can_merge () {
return 0
}