X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve.sh;h=926307005493b7c8c4253b1adff34bdb4bc57b77;hb=e99fcf96deab45ca81b22948328deb2d8586aa8d;hp=7d8fb54f952e3f85c8c77b8fd9c67afbe76f0316;hpb=302ebfe52192fff9a2c1c612dff22325fd073acc;p=git.git diff --git a/git-resolve.sh b/git-resolve.sh index 7d8fb54f..92630700 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -4,11 +4,9 @@ # # Resolve two trees. # -. git-sh-setup || die "Not a git archive" -usage () { - die "git-resolve " -} +USAGE=' ' +. git-sh-setup dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \