Mercurial > evolve

diff tests/test-stabilize-result.t @ 4315:55ca0b6276e7 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 24 Dec 2018 17:47:31 +0100
parents f9a850018daa 4a740f9eee49
children e6ee830c4f45 a2fdbece7ce1
line wrap: on
line diff
--- 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