X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-resolve-script;h=50d5f8336feec0eb9839a2641cb9faf9ab67391d;hb=b0e985d5de5623a56a3ff1e8a77af6323774f93f;hp=4641119e0f00848f5dacce40fd376efc1cbdbcb5;hpb=f4cedd483e5bc4b9553dbc40e084548f7f3bf2ab;p=git.git diff --git a/git-resolve-script b/git-resolve-script index 4641119e0..50d5f8336 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