Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-B6.t @ 5015:43f4784a3f21
evolve: add test for `--continue` case when relocating "divergent"
This test shows that for now we don't handle the continue case when
relocating "divergent" cset hit merge conflict while resolving
content-divergence.
Next patch will be adding the support for --continue case.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Mon, 25 Nov 2019 21:28:52 +0530 |
| parents | a8ff17479fb8 |
| children | f3e39a354378 |
comparison
equal
deleted
inserted
replaced
| 5014:35870ce163ee | 5015:43f4784a3f21 |
|---|