diff options
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 6a721064c..feee6a4a0 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 } |