From: Josh Triplett <josh@freedesktop.org>
Date: Wed, 6 Jun 2007 04:24:19 +0000 (-0700)
Subject: Fix typo in git-mergetool
X-Git-Tag: v1.5.3-rc0~154
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2571ac67229370e9b27d19df29f529e7fd5f7502;p=git.git

Fix typo in git-mergetool

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

diff --git a/git-mergetool.sh b/git-mergetool.sh
index e62351bcb..bb21b037d 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] ...'