trivial: typo in git-commit.sh
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
88fb958baa
commit
b6ae5409ea
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user