diff options
| -rw-r--r-- | git-resolve-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve-script b/git-resolve-script index c04c0307b2..c2f7a6e240 100644 --- 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 |