Mercurial > evolve
diff tests/test-evolve-public-content-divergent-corner-cases.t @ 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 | 7204178ac04a |
| children | 548cddc1ae7a b1d1f4ade142 |
line wrap: on
line diff
--- 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