Fix typo in git-mergetool

Signed-off-by: NJosh Triplett <josh@freedesktop.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

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] ...'