tests/test-stabilize-result.t
branchmercurial-4.6
changeset 4313 4a740f9eee49
parent 4074 eb4d07a0b19f
parent 4311 8aa28e68ac44
child 4315 55ca0b6276e7
--- a/tests/test-stabilize-result.t	Fri Dec 21 20:14:20 2018 +0100
+++ b/tests/test-stabilize-result.t	Mon Dec 24 17:47:28 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