Mercurial > evolve
comparison tests/test-push-checkheads-pruned-B2.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 | ab3581bc0637 |
| children | f555039d1a08 62b60fc1983d |
comparison
equal
deleted
inserted
replaced
| 4417:b86413cfca4a | 4418:0ec30a7d9e12 |
|---|