Mercurial Mercurial > pub > hg > evolve / 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.
hgext/evolve.py
branchstable
changeset 1153 4241a5162de7
parent 1152 be6eff57d5bb
child 1157 5951969400ce 
--- a/hgext/evolve.py	Wed Nov 05 15:32:25 2014 -0800
+++ b/hgext/evolve.py	Wed Nov 05 15:35:13 2014 -0800
@@ -1494,8 +1494,8 @@
                          "| evolve does not work in that case.\n"
                          "| rebase one of them next to the other and run \n"
                          "| this command again.\n"
-                         "| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s\n"
-                         "| - or:     hg rebase -dest 'p1(%(d)s)' -r %(o)s"
+                         "| - either: hg rebase --dest 'p1(%(d)s)' -r %(o)s\n"
+                         "| - or:     hg rebase --dest 'p1(%(o)s)' -r %(d)s"
                               % {'d': divergent, 'o': other})
 
     displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
evolve