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-evolve-content-divergent-interrupted.t
changeset 4578 75e76141cba2
parent 4481 d02a7c8cdee5
child 4633 61c2518cd6d2 
--- a/tests/test-evolve-content-divergent-interrupted.t	Wed Apr 24 15:59:02 2019 +0200
+++ b/tests/test-evolve-content-divergent-interrupted.t	Wed Apr 24 16:35:01 2019 +0800
@@ -79,7 +79,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[6] added d
   with: [5] added d
   base: [4] added d
@@ -447,7 +447,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[6] added d
   with: [5] added d
   base: [4] added d
evolve