comparison tests/test-evolve-cycles.t @ 4413:2360a1e050a6

evolve: pin the public cset to local side in merging when solving public div While working on public divergence, I think it would be better to pin the public cset to local side of merge for understanding and handling the future cases without any ambiguity. Changes in tests reflect the changed behaviour.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Mon, 25 Feb 2019 22:50:24 +0530
parents e6bea259c227
children 98941c28f3e2 a2fdbece7ce1 30a544904238
comparison
equal deleted inserted replaced
4412:dcbe64c954dc 4413:2360a1e050a6