Mercurial > evolve

comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 6256:314682992f7d 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 Tue, 26 Apr 2022 11:15:27 +0400
parents e82ad19eb3cc
children 55e9987b8384 716912541759
comparison
equal deleted inserted replaced
6255:21fe1a798ced 6256:314682992f7d
420 continue: hg evolve --continue 420 continue: hg evolve --continue
421 421
422 $ hg evolve --continue 422 $ hg evolve --continue
423 evolving 4:e568fd1029bb "added c e" 423 evolving 4:e568fd1029bb "added c e"
424 file 'd' was deleted in other but was modified in local. 424 file 'd' was deleted in other but was modified in local.
425 You can use (c)hanged version, (d)elete, or leave (u)nresolved. 425 What do you want to do?
426 What do you want to do? u 426 use (c)hanged version, (d)elete, or leave (u)nresolved? u
427 1 files updated, 0 files merged, 0 files removed, 1 files unresolved 427 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
428 unresolved merge conflicts 428 unresolved merge conflicts
429 (see 'hg help evolve.interrupted') 429 (see 'hg help evolve.interrupted')
430 [1] 430 [1]
431 431