aboutsummaryrefslogtreecommitdiff
path: root/git-commit.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-commit.sh')
-rwxr-xr-xgit-commit.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-commit.sh b/git-commit.sh
index d8bfc3c25..9412840d8 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"