summaryrefslogtreecommitdiffstats
path: root/doc/usage-intro.txt
diff options
context:
space:
mode:
Diffstat (limited to 'doc/usage-intro.txt')
-rw-r--r--doc/usage-intro.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/usage-intro.txt b/doc/usage-intro.txt
index 2cf2096..1ce5c26 100644
--- a/doc/usage-intro.txt
+++ b/doc/usage-intro.txt
@@ -12,16 +12,18 @@ Complete:
extract [-o DIR] PATCH
-Partially:
-
merge [-S SNAP] SNAP DIR
-Not yet:
merge [-S SNAP] PATCH DIR
merge [-S SNAP] DIR DIR
- merge [-S SNAP] URL://DIR DIR
makepatch [-S SNAP] -O PATCH SNAP DIR
makepatch [-S SNAP] SNAP DIR > PATCH
+
+Not yet:
+
+ merge [-S SNAP] URL://DIR DIR
+
+
$Id$