diff tests/test-topic-push.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 1bc4b0807c37
children 537fd9a86c06 cbfd36046969
line wrap: on
line diff