From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 5 Jan 2006 11:44:59 +0000 (+0100)
Subject: trivial: typo in git-commit.sh
X-Git-Tag: v1.0.7^2~15
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b6ae5409ea446365c328561dc17311111058ec26;p=git.git

trivial: typo in git-commit.sh

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-commit.sh b/git-commit.sh
index 7e39c107..82d743bd 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -148,7 +148,7 @@ esac
 
 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
 	echo "#"
-	echo "# It looks like your may be committing a MERGE."
+	echo "# It looks like you may be committing a MERGE."
 	echo "# If this is not correct, please remove the file"
 	echo "#	$GIT_DIR/MERGE_HEAD"
 	echo "# and try again"