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
branchmercurial-4.4
changeset 4315 55ca0b6276e7
parent 4076 f9a850018daa
parent 4313 4a740f9eee49
child 4316 e6ee830c4f45
child 4363 a2fdbece7ce1 
--- a/tests/test-stabilize-result.t	Fri Dec 21 20:14:23 2018 +0100
+++ b/tests/test-stabilize-result.t	Mon Dec 24 17:47:31 2018 +0100
@@ -93,7 +93,6 @@
   +a
   +newer a
   $ hg evolve --continue
-  evolving 4:3655f0f50885 "newer a"
   abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
   $ hg resolve -m a
evolve