Mercurial > evolve

comparison 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
comparison
equal deleted inserted replaced
4206:04aeaec6ec07 4214:112980bb2c76
167 s0^ Added foo (base) 167 s0^ Added foo (base)
168 168
169 $ hg evolve --content-divergent -r ec94a1ed1330 169 $ hg evolve --content-divergent -r ec94a1ed1330
170 merge:[s5] Added e and f 170 merge:[s5] Added e and f
171 with: [s4] Added e and f 171 with: [s4] Added e and f
172 base: [s] Added e and f 172 base: [3] Added e and f
173 updating to "local" side of the conflict: ec94a1ed1330 173 updating to "local" side of the conflict: ec94a1ed1330
174 merging "other" content-divergent changeset 'f2eff98490d2' 174 merging "other" content-divergent changeset 'f2eff98490d2'
175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
176 working directory is now at 8faad6276dc6 176 working directory is now at 8faad6276dc6