Mercurial > evolve

comparison tests/test-evolve-content-divergent-corner-cases.t @ 5090:2631e735ec16 mercurial-4.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.8 into mercurial-4.7
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 23 Jan 2020 17:40:57 +0700
parents 5d76b320420e
children 308c1e09f80f a7fb433faab6
comparison
equal deleted inserted replaced
5089:55580b0b2b77 5090:2631e735ec16
276 merge:[5] updated e 276 merge:[5] updated e
277 with: [6] updated e 277 with: [6] updated e
278 base: [4] added e 278 base: [4] added e
279 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be 279 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be
280 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be 280 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be
281 file 'd' was deleted in local but was modified in other. 281 other changed d which local deleted
282 What do you want to do?
283 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c 282 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
284 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 283 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
285 working directory is now at eb6357cd41b6 284 working directory is now at eb6357cd41b6
286 285
287 $ hg glog -l1 286 $ hg glog -l1