Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 4418:0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Added a test in public divergence where both the cset are on the different
parent and no conflict in relocation but in merging.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 02 Mar 2019 02:34:29 +0530 |
| parents | 5300be965515 |
| children | 2cbb9914d227 ab5bc57ba897 2db0aca03a88 |
comparison
equal
deleted
inserted
replaced
| 4417:b86413cfca4a | 4418:0ec30a7d9e12 |
|---|