From deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 25 Sep 2005 00:12:06 -0700 Subject: Give default merge message after failed automerge. Signed-off-by: Junio C Hamano --- git-commit.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'git-commit.sh') diff --git a/git-commit.sh b/git-commit.sh index d8bfc3c254..9412840d8f 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -141,6 +141,9 @@ t) esac if [ -f "$GIT_DIR/MERGE_HEAD" ]; then + + test -f "$GIT_DIR/MERGE_MSG" && cat "$GIT_DIR/MERGE_MSG" + echo "#" echo "# It looks like your may be committing a MERGE." echo "# If this is not correct, please remove the file" -- cgit 1.2.3-korg