Mercurial > evolve
diff tests/test-import.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 | 9f42f819267b |
children | 995ed7aac8a6 |