diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/tartree-edit | 4 |
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 |