X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=git-resolve-script;h=bf2fb2d431da4702cd2b5fe3f414ce22c7ab284d;hb=41cb7488b9e5998ce1d665bbe10beca0a0f69c1c;hp=91b001b9a9afbcadcbacf886dd11821c2aeee1b2;hpb=c591412cc0aaf10890cdda4cf97a4fbc782d7d49;p=git.git

diff --git a/git-resolve-script b/git-resolve-script
index 91b001b9..bf2fb2d4 100755
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -12,7 +12,7 @@ merge_repo="$3"
 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
 dropheads() {
-	rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD" \
+	rm -f -- "$GIT_DIR/MERGE_HEAD" \
 		"$GIT_DIR/LAST_MERGE" || exit 1
 }
 
@@ -44,7 +44,7 @@ if [ "$common" == "$head" ]; then
 	echo "Updating from $head to $merge."
 	git-read-tree -u -m $head $merge || exit 1
 	echo $merge > "$GIT_DIR"/HEAD
-	git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
+	git-diff-tree -p $head $merge | git-apply --stat
 	dropheads
 	exit 0
 fi