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.
tests/test-sharing.t
changeset 1404 848a04c078c7
parent 1356 aff6bc2a6b2d
child 1450 5f6e78aea094 
--- a/tests/test-sharing.t	Fri Jun 19 13:57:16 2015 -0700
+++ b/tests/test-sharing.t	Tue Jun 16 15:14:37 2015 -0700
@@ -492,7 +492,7 @@
   7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
 
 Use evolve to fix the divergence.
-  $ HGMERGE=internal:other hg evolve
+  $ HGMERGE=internal:other hg evolve --divergent
   merge:[6] fix bug 24 (v2 by bob)
   with: [7] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
evolve