Mercurial > evolve

comparison tests/test-evolve-content-divergent-corner-cases.t @ 5159:e5fe3ca5e6ad mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 28 Feb 2020 23:18:48 +0700
parents 5d76b320420e 1f92a6aa40d6
children a7fb433faab6 e6e92835d42d
comparison
equal deleted inserted replaced
5158:8d20c0af010a 5159:e5fe3ca5e6ad
279 with: [6] updated e 279 with: [6] updated e
280 base: [4] added e 280 base: [4] added e
281 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be 281 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be
282 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be 282 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be
283 file 'd' was deleted in local but was modified in other. 283 file 'd' was deleted in local but was modified in other.
284 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. 284 What do you want to do?
285 What do you want to do? c 285 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
286 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 286 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
287 working directory is now at eb6357cd41b6 287 working directory is now at eb6357cd41b6
288 288
289 $ hg glog -l1 289 $ hg glog -l1
290 @ 9:eb6357cd41b6 updated e 290 @ 9:eb6357cd41b6 updated e