chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
78b07fb
)
Test suite: tartree-edit: document gitfetchinfo-merge in usage message
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 3 Jul 2016 22:12:02 +0000
(23:12 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 14:50:54 +0000
(15:50 +0100)
tests/tartree-edit
patch
|
blob
|
history
diff --git
a/tests/tartree-edit
b/tests/tartree-edit
index bf5238cd3f57e8df5238892cf6d1e192c87e122c..96a5bcb093eebe1e411f5ad432a4dfc44acb9f42 100755
(executable)
--- 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