Mercurial > evolve

comparison tests/test-evolve-content-divergent-corner-cases.t @ 5317:011b53a9d03c 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 Fri, 08 May 2020 22:18:15 +0800
parents a7fb433faab6 e6e92835d42d
children 88f9bbba392d 8d93e7fc0daa
comparison
equal deleted inserted replaced
5316:ae4dbbf2b929 5317:011b53a9d03c
350 merge:[5] updated e 350 merge:[5] updated e
351 with: [6] updated e 351 with: [6] updated e
352 base: [4] added e 352 base: [4] added e
353 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be 353 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be
354 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be 354 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be
355 file 'd' was deleted in local but was modified in other. 355 other changed d which local deleted
356 What do you want to do?
357 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c 356 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
358 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 357 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
359 working directory is now at 51ee71efed61 358 working directory is now at 51ee71efed61
360 359
361 $ hg glog -l1 360 $ hg glog -l1