Mercurial > evolve
comparison tests/test-push-checkheads-pruned-B8.t @ 5730:a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
While deciding the resolution parent for content-divergence resolution, now we
use 3-way merge logic to check, if only one of them was moved from its original
position by comparing the parent of both divergent cset with parent of base.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 22 Jan 2021 05:37:43 +0100 |
| parents | a8ff17479fb8 |
| children | f3e39a354378 144d10e74757 |
comparison
equal
deleted
inserted
replaced
| 5729:3a1e07c27e4a | 5730:a119432bafc1 |
|---|