Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-A2.t @ 5578:b0234a269f29
evolve: update public content divergence acc. to new behavior
Now this method _pickresolutionparent() is to decide which cset would
be the resolution parent and no need to update evolvestate here since
we do that later.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 21 Aug 2020 16:22:24 +0530 |
| parents | a8ff17479fb8 |
| children | f3e39a354378 |
comparison
equal
deleted
inserted
replaced
| 5577:2f78cb38620f | 5578:b0234a269f29 |
|---|