diff tests/test-issue-6028.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 f2d919aa64d6
children b68789e8c535
line wrap: on
line diff