X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=50d5f8336feec0eb9839a2641cb9faf9ab67391d;hb=fb2af0375bcef9f5f5cbb1f4dc9f81459ce1f4b1;hp=4641119e0f00848f5dacce40fd376efc1cbdbcb5;hpb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;p=git.git diff --git a/git-resolve-script b/git-resolve-script index 4641119e..50d5f833 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -6,21 +6,25 @@ # . git-sh-setup-script || die "Not a git archive" -head=$(git-rev-parse --verify "$1"^0) || exit -merge=$(git-rev-parse --verify "$2"^0) || exit -merge_msg="$3" +usage () { + die "git-resolve-script