From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Jul 2016 22:12:02 +0000 (+0100)
Subject: Test suite: tartree-edit: document gitfetchinfo-merge in usage message
X-Git-Tag: archive/debian/2.0~343
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ae636a9fe059f5f6f75be64e9bc48d842986172f

Test suite: tartree-edit: document gitfetchinfo-merge in usage message
---

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