Merge branch 'aj/pack'

diff --git a/git-mergetool.sh b/git-mergetool.sh
index e62351bcbabc00a3d89ddf1c8dd936cea400501f..bb21b037d65f5a63ba461647b449c9390cb1488f 100755 (executable)
--- 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] ...'