X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-resolve.sh;h=926307005493b7c8c4253b1adff34bdb4bc57b77;hb=711fc8f660be16ae4c4caaf3caa495d12310b5ad;hp=fcc5ad7349e3f77a6817e499b331b262c4a07b57;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git diff --git a/git-resolve.sh b/git-resolve.sh index fcc5ad734..926307005 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -4,11 +4,9 @@ # # Resolve two trees. # -. git-sh-setup -usage () { - die "git-resolve