Fix typo in git-mergetool

Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Jun 6, 2007 · 2571ac6 · 2571ac6
1 parent e6ff0f4
commit 2571ac6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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] ...'