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-stabilize-result.t
changeset 3759 3fe3f3070df9
parent 3747 1e103c7f7663
child 3760 88601e1cd5d8 
--- a/tests/test-stabilize-result.t	Tue May 22 23:51:57 2018 +0530
+++ b/tests/test-stabilize-result.t	Tue May 22 20:33:42 2018 +0530
@@ -413,12 +413,6 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  merge:[17] More addition (2)
-  with: [18] More addition (2)
-  base: [16] More addition
-  updating to "local" side of the conflict: 0b336205a5d0
-  merging "other" content-divergent changeset 'e015aa78acee'
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at e015aa78acee
   $ glog
   @  18:e015aa78acee@default(draft) bk:[] More addition (2)
evolve