X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-resolve.sh;h=926307005493b7c8c4253b1adff34bdb4bc57b77;hb=975b31dc6e12fba8f7b067ddbe32230995e05400;hp=fcc5ad7349e3f77a6817e499b331b262c4a07b57;hpb=93dcab2937624ebb97f91807576cddb242a55a46;p=git.git diff --git a/git-resolve.sh b/git-resolve.sh index fcc5ad73..92630700 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -4,11 +4,9 @@ # # Resolve two trees. # -. git-sh-setup -usage () { - die "git-resolve " -} +USAGE=' ' +. git-sh-setup dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \