summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 88fb958)
raw | patch | inline | side by side (parent: 88fb958)
author | Alex Riesen <raa.lkml@gmail.com> | |
Thu, 5 Jan 2006 11:44:59 +0000 (12:44 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Fri, 6 Jan 2006 01:23:16 +0000 (17:23 -0800) |
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-commit.sh | patch | blob | history |
diff --git a/git-commit.sh b/git-commit.sh
index 7e39c107cff93f601c51fec6544a0defe9814db1..82d743bd037db74f4233a620b001fb3002f346cc 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
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"