Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 3419:1e2f683e11e7 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 16 Jan 2018 04:38:04 +0100
parents 3e2abd40da07 85cdce113c2c
children 7a5c3175015e
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Sat Dec 16 23:40:40 2017 +0100
+++ b/tests/test-stabilize-conflict.t	Tue Jan 16 04:38:04 2018 +0100
@@ -167,7 +167,7 @@
   $ hg resolve --all -m
   (no more unresolved files)
   $ hg evolve --continue
-  grafting 5:71c18f70c34f "babar count up to fifteen"
+  evolving 5:71c18f70c34f "babar count up to fifteen"
   $ hg resolve -l
   $ hg log -G
   @  changeset:   8:1836b91c6c1d