Mercurial Mercurial > public > mercurial-scm > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-parameters.out
changeset 8076 5ec526c1a32f
parent 8031 813a02a4eda2
child 9073 ec1cd3176625
child 9589 fdf0c375cdbf 
--- a/tests/test-rebase-parameters.out	Sat Apr 18 00:21:11 2009 -0700
+++ b/tests/test-rebase-parameters.out	Sat Apr 18 14:40:21 2009 +0200
@@ -11,7 +11,7 @@
     changes relative to a master development tree.
 
     If a rebase is interrupted to manually resolve a merge, it can be
-    continued with --continue or aborted with --abort.
+    continued with --continue/-c or aborted with --abort/-a.
 
 options:
 
@@ -39,7 +39,7 @@
     changes relative to a master development tree.
 
     If a rebase is interrupted to manually resolve a merge, it can be
-    continued with --continue or aborted with --abort.
+    continued with --continue/-c or aborted with --abort/-a.
 
 options:
 
@@ -67,7 +67,7 @@
     changes relative to a master development tree.
 
     If a rebase is interrupted to manually resolve a merge, it can be
-    continued with --continue or aborted with --abort.
+    continued with --continue/-c or aborted with --abort/-a.
 
 options:
 
@@ -95,7 +95,7 @@
     changes relative to a master development tree.
 
     If a rebase is interrupted to manually resolve a merge, it can be
-    continued with --continue or aborted with --abort.
+    continued with --continue/-c or aborted with --abort/-a.
 
 options:
mercurial-scm/hg