summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-03 23:12:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 15:50:54 +0100
commitae636a9fe059f5f6f75be64e9bc48d842986172f (patch)
treea79c677bf67b941d9f8e5692e612c2cb1be67bcd
parent78b07fbae13bbed34172c1bbe14235099c91e2a6 (diff)
Test suite: tartree-edit: document gitfetchinfo-merge in usage message
-rwxr-xr-xtests/tartree-edit4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/tartree-edit b/tests/tartree-edit
index bf5238c..96a5bcb 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