Mercurial > evolve

diff tests/test-topic-stack-complex.t @ 4214:112980bb2c76 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 Thu, 25 Oct 2018 18:32:52 +0200
parents 04aeaec6ec07 18d5a7525c2c
children d3a8a60e7515 a2fdbece7ce1
line wrap: on
line diff
--- a/tests/test-topic-stack-complex.t	Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-stack-complex.t	Thu Oct 25 18:32:52 2018 +0200
@@ -169,7 +169,7 @@
   $ hg evolve --content-divergent -r ec94a1ed1330
   merge:[s5] Added e and f
   with: [s4] Added e and f
-  base: [s] Added e and f
+  base: [3] Added e and f
   updating to "local" side of the conflict: ec94a1ed1330
   merging "other" content-divergent changeset 'f2eff98490d2'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved