Mercurial > evolve
comparison tests/test-single-head-obsolescence-topic-B1.t @ 5782:72f65a647203
divergence-resolution: take parent successors in account
If the parent were rewritten we need to take them in accound, but to help
with resolution of a stack and to have a better 3 way merge.
Changes in test file reflect the new behavior.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 22 Jan 2021 05:37:43 +0100 |
| parents | fa1324e58fcf |
| children | 35e769c9604f 144d10e74757 |
comparison
equal
deleted
inserted
replaced
| 5781:613a144de642 | 5782:72f65a647203 |
|---|