Mercurial > evolve
diff CHANGELOG @ 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 | 054ff759f2fd |
children | 62a6f8f4e694 |