diff tests/test-evolve-content-divergent-case-A4.t @ 5725:e6b0ed34bc18

divergence-resolution: return rev from _pickresolutionparent() This change makes the code clear and will help us in upcoming patches.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Thu, 22 Oct 2020 21:12:50 +0530
parents c2fab88e6d60
children 03410b04cf10
line wrap: on
line diff