summaryrefslogtreecommitdiff
path: root/git-commit.sh
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2006-01-05 11:44:59 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-06 01:23:16 (GMT)
commitb6ae5409ea446365c328561dc17311111058ec26 (patch)
treed428d9651638b2515dce6f9df71fbd3ed712381b /git-commit.sh
parent88fb958baa1066af23348c44a78b812be2344088 (diff)
downloadgit-b6ae5409ea446365c328561dc17311111058ec26.zip
git-b6ae5409ea446365c328561dc17311111058ec26.tar.gz
git-b6ae5409ea446365c328561dc17311111058ec26.tar.bz2
trivial: typo in git-commit.sh
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-commit.sh')
-rwxr-xr-xgit-commit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-commit.sh b/git-commit.sh
index 7e39c10..82d743b 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"