Mercurial > evolve
changeset 6121:0804f51208d6
tests: add merge labels
CORE-TEST-OUTPUT-UPDATE: a809f1465a76
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 01 Feb 2022 18:12:37 +0300 |
| parents | 2662c6704ebd |
| children | dbedbcf30f6b |
| files | tests/test-evolve-content-divergent-corner-cases.t tests/test-evolve-public-content-divergent-corner-cases.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t Wed Jan 19 09:17:22 2022 +0300 +++ b/tests/test-evolve-content-divergent-corner-cases.t Tue Feb 01 18:12:37 2022 +0300 @@ -375,7 +375,7 @@ with: [6] updated e base: [4] added e rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a - file 'd' was deleted in local but was modified in other. + file 'd' was deleted in local [local] but was modified in other [other]. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. What do you want to do? c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Wed Jan 19 09:17:22 2022 +0300 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Tue Feb 01 18:12:37 2022 +0300 @@ -421,7 +421,7 @@ $ hg evolve --continue evolving 4:e568fd1029bb "added c e" - file 'd' was deleted in other but was modified in local. + file 'd' was deleted in other [other] but was modified in local [local]. You can use (c)hanged version, (d)elete, or leave (u)nresolved. What do you want to do? u 1 files updated, 0 files merged, 0 files removed, 1 files unresolved