diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-25 00:12:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-26 18:04:17 -0700 |
| commit | deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e (patch) | |
| tree | 49b93d4d45cd52f4c05b1030d05b4b8329c5824a /git-commit.sh | |
| parent | e2f5f6ef6795c880a2f13ea472b96704b4a4ca94 (diff) | |
| download | git-deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e.tar.gz | |
Give default merge message after failed automerge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 3 |
1 files changed, 3 insertions, 0 deletions
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" |