diff --git a/git-commit.sh b/git-commit.sh
index 741444aa06f68ec59430e2d6a9e3fc56c56f5965..d8bfc3c254929d3fb7a8aa702b4f4a86edefe8f0 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
PARENTS=""
else
if [ -f "$GIT_DIR/MERGE_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
fi
if test "$use_commit" != ""
then