Make "git commit" work correctly in the presense of a manual merge

diff --git a/git-resolve-script b/git-resolve-script
index da79a973eaafa1b8b7e21b719698762896e13569..0b04a5f6af8b97065cfe812509f2d96a600825ab 100644 (file)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -57,4 +57,5 @@ fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
-git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
+git-diff-tree -p $head $result_commit | git-apply --stat
+rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD