Fix git-resolve-script.

I'd stupidly forgotten one merge_head -> merge conversion, and
all my tests were for the fast-forward case that never triggered
the bug.

diff --git a/git-resolve-script b/git-resolve-script
index c04c0307b2b7c2b83c7707c90b844aa958a6c407..c2f7a6e240fb9efad97b00595bd1d5ed3829a8b8 100644 (file)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -49,7 +49,7 @@ if [ $? -ne 0 ]; then
        merge_msg="Automatic merge of $merge_repo"
        result_tree=$(git-write-tree) || exit 1
 fi
-result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge_head)
+result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
 echo $result_commit > .git/HEAD
 git-checkout-cache -f -a && git-update-cache --refresh