Fix typo in git-mergetool

joshtriplett · gitster · commit 2571ac672293 · 2007-06-06T00:40:50.000-07:00
Signed-off-by: Josh Triplett &lt;josh@freedesktop.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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] ...'

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Copyright (c) 2006 Theodore Y. Ts'o`
`6`	`6`	`#`
`7`	`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`	`9`	`#`
`10`	`10`
`11`	`11`	`USAGE='[--tool=tool] [file to merge] ...'`