[PATCH] Reorder Makefile rules

[git.git] / git-resolve-script

diff --git a/git-resolve-script b/git-resolve-script
index fffcb07..52dd83b 100755 (executable)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -6,8 +6,8 @@
 #
 . git-sh-setup-script || die "Not a git archive"
 
-head=$(git-rev-parse --revs-only "$1")
-merge=$(git-rev-parse --revs-only "$2")
+head=$(git-rev-parse --verify "$1")
+merge=$(git-rev-parse --verify "$2")
 merge_msg="$3"
 
 dropheads() {