From ae636a9fe059f5f6f75be64e9bc48d842986172f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Jul 2016 23:12:02 +0100
Subject: Test suite: tartree-edit: document gitfetchinfo-merge in usage
 message

---
 tests/tartree-edit | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/tartree-edit')

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
-- 
cgit v1.2.3