Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 6805:e51dfd0e1a88 mercurial-6.0
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 |
|---|---|
| 419 (no more unresolved files) | 419 (no more unresolved files) |
| 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 [other] but was modified in local [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 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
| 426 What do you want to do? u | 426 What do you want to do? 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') |