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-public-content-divergent-main.t
changeset 4576 96ce1030d2fb
parent 4530 d081cc4f5fef
child 4577 bcd52ce0916d 
--- a/tests/test-evolve-public-content-divergent-main.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-main.t	Sun Apr 14 02:18:19 2019 +0800
@@ -355,7 +355,7 @@
   o  0:9092f1db7931 added a
       public
   
-  $ hg evolve --content-divergent --any
+  $ hg evolve --content-divergent --any --update
   merge:[5] added d
   with: [4] added d c e
   base: [3] added d
evolve