Fix typo in git-mergetool
Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Josh Triplett committed
Jun 5, 2007 at 21:24 UTC
2571ac67229370e9b27d19df29f529e7fd5f7502
1 file changed
+1
-1
git-mergetool.sh
+1
-1
@@ -5,7 +5,7 @@
5
# Copyright (c) 2006 Theodore Y. Ts'o
6
#
7
# This file is licensed under the GPL v2, or a later version
8
-# at the discretion of Junio C Hammano.
8
+# at the discretion of Junio C Hamano.
9
#
10
11
USAGE='[--tool=tool] [file to merge] ...'