summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2007-06-06 04:24:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-06 07:40:50 (GMT)
commit2571ac67229370e9b27d19df29f529e7fd5f7502 (patch)
tree43230080f874723f6c1cf5bca550ce923bceb27a /git-mergetool.sh
parente6ff0f42bb0c63515c8489c1992f37d1d1e8b2f4 (diff)
downloadgit-2571ac67229370e9b27d19df29f529e7fd5f7502.zip
git-2571ac67229370e9b27d19df29f529e7fd5f7502.tar.gz
git-2571ac67229370e9b27d19df29f529e7fd5f7502.tar.bz2
Fix typo in git-mergetool
Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index e62351b..bb21b03 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -5,7 +5,7 @@
# Copyright (c) 2006 Theodore Y. Ts'o
#
# This file is licensed under the GPL v2, or a later version
-# at the discretion of Junio C Hammano.
+# at the discretion of Junio C Hamano.
#
USAGE='[--tool=tool] [file to merge] ...'