diff tests/test-evolve-public-content-divergent-main.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 61d2f1cf90f0
children 8e4f6354b316 b0b1ab64f6d8
line wrap: on
line diff