X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-commit.sh;h=d8bfc3c254929d3fb7a8aa702b4f4a86edefe8f0;hb=654291a2acb1c28b884cb9376a0d7eb5f8c090b5;hp=741444aa06f68ec59430e2d6a9e3fc56c56f5965;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-commit.sh b/git-commit.sh
index 741444aa0..d8bfc3c25 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -158,7 +158,7 @@ if [ ! -r "$GIT_DIR/HEAD" ]; then
 	PARENTS=""
 else
 	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
-		PARENTS="-p HEAD -p MERGE_HEAD"
+		PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
 	fi
 	if test "$use_commit" != ""
 	then