X-Git-Url: http://git.scripts.mit.edu/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=feee6a4a0d3a970c94fe506070ddc497c4b40658;hb=00160242770aea137ec7154a8e8406feef733926;hp=6a721064c288609fde50fc84e963519ceb00723e;hpb=cb29dfde484e459e4329281151b05ef1c5ad462c;p=git.git

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 6a721064c2..feee6a4a0d 100644
--- 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 overridden by tools.
 	can_merge () {
 		return 0
 	}