From: Josh Triplett <josh@freedesktop.org>
Date: Wed, 06 Jun 2007 04:24:19 GMT
Subject: [PATCH] Fix typo in git-mergetool
Message-ID: <466636F3.8020606@freedesktop.org>

Signed-off-by: Josh Triplett <josh@freedesktop.org>
---
 git-mergetool.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-mergetool.sh b/git-mergetool.sh
index e62351b..bb21b03 100755
--- 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] ...'
-- 
1.5.2.1