summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Alex Riesen <raa.lkml@gmail.com>2006-01-05 12:44:59 +0100
committerLibravatar Junio C Hamano <junkio@cox.net>2006-01-05 17:23:16 -0800
commitb6ae5409ea446365c328561dc17311111058ec26 (patch)
treed428d9651638b2515dce6f9df71fbd3ed712381b
parentuse result of open(2) to check for presence (diff)
downloadtgif-b6ae5409ea446365c328561dc17311111058ec26.tar.xz
trivial: typo in git-commit.sh
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-commit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-commit.sh b/git-commit.sh
index 7e39c107cf..82d743bd03 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"