X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftartree-edit;fp=tests%2Ftartree-edit;h=96a5bcb093eebe1e411f5ad432a4dfc44acb9f42;hb=ae636a9fe059f5f6f75be64e9bc48d842986172f;hp=bf5238cd3f57e8df5238892cf6d1e192c87e122c;hpb=78b07fbae13bbed34172c1bbe14235099c91e2a6;p=dgit.git diff --git a/tests/tartree-edit b/tests/tartree-edit index bf5238cd..96a5bcb0 100755 --- a/tests/tartree-edit +++ b/tests/tartree-edit @@ -67,7 +67,9 @@ case "$#.$1" in ?.-*) fail "no options understood" ;; *) fail "usage: tartree-edit edit|done DIRECTORY|TARBALL - tartree-edit gitfetchinfo DIRECTORY|TARBALL REMOTE" ;; + tartree-edit gitfetchinfo DIRECTORY|TARBALL REMOTE + tartree-edit gitfetchinfo-merge REMOTE-A REMOTE-B" ;; + # we don't document gitfetchinfo-diff because it's rather poor esac case "$arg" in