diff options
| author | Ondřej Bílka <neleai@seznam.cz> | 2013-07-29 10:18:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-29 12:32:25 -0700 |
| commit | 98e023dea40a0eca8a61c037dfc59aaf27f003a4 (patch) | |
| tree | c36b17d6bc32ffdc55625c64ee61160f48ec5b5e /git-mergetool--lib.sh | |
| parent | 749f763dbbe4dbcc4082f02bf98bfc1a09427c6f (diff) | |
| download | git-98e023dea40a0eca8a61c037dfc59aaf27f003a4.tar.gz | |
many small typofixesob/typofixes
Signed-off-by: Ondřej Bílka <neleai@seznam.cz>
Reviewed-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 } |