Give default merge message after failed automerge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-25 00:12:06 -07:00
parent e2f5f6ef67
commit deca7e8c59
2 changed files with 13 additions and 4 deletions
--- 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"