X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=git-resolve.sh;h=fcc5ad7349e3f77a6817e499b331b262c4a07b57;hb=706fe6ae03e2c1452d59892944701c56237b903f;hp=7d8fb54f952e3f85c8c77b8fd9c67afbe76f0316;hpb=3eeb419968c1f8f0a762a7127db770e9d9c8037d;p=git.git diff --git a/git-resolve.sh b/git-resolve.sh index 7d8fb54f..fcc5ad73 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -4,7 +4,7 @@ # # Resolve two trees. # -. git-sh-setup || die "Not a git archive" +. git-sh-setup usage () { die "git-resolve