chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Manpage: add dgit-maint-merge.7.pod
[dgit.git]
/
tests
/
tartree-edit
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
?.-*) 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
esac
case "$arg" in