diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-08-01 11:58:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-01 12:01:01 -0700 |
| commit | d50cb7569cfb6e04ba48900821618d28012f334e (patch) | |
| tree | 641264cefb155981b8861759cd39665ffcd04cd2 /git-mergetool--lib.sh | |
| parent | Merge branch 'ms/subtree-install-fix' (diff) | |
| parent | many small typofixes (diff) | |
| download | tgif-d50cb7569cfb6e04ba48900821618d28012f334e.tar.xz | |
Merge branch 'ob/typofixes'
* ob/typofixes:
many small typofixes
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 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 } |