COPTS -> CFLAGS

diff --git a/git-commit.sh b/git-commit.sh
index d8bfc3c254929d3fb7a8aa702b4f4a86edefe8f0..9412840d8f2cc58b19d2ae3406396f2a271135d4 100755 (executable)
--- 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"