Mercurial > evolve

comparison tests/test-evolve-content-divergent-interrupted.t @ 6805:e51dfd0e1a88 mercurial-6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-6.1 into mercurial-6.0
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 26 Jun 2024 15:39:36 +0400
parents 9a41c3c293ae
children 1328195f76a9
comparison
equal deleted inserted replaced
6804:241c4fec9723 6805:e51dfd0e1a88
381 continue: hg evolve --continue 381 continue: hg evolve --continue
382 382
383 $ hg evolve -c 383 $ hg evolve -c
384 evolving 8:a8673909e314 "added d" 384 evolving 8:a8673909e314 "added d"
385 merging a 385 merging a
386 merging d
386 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 387 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
387 merging d
388 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 388 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
389 0 files updated, 0 files merged, 0 files removed, 2 files unresolved 389 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
390 unresolved merge conflicts 390 unresolved merge conflicts
391 (see 'hg help evolve.interrupted') 391 (see 'hg help evolve.interrupted')
392 [240] 392 [240]