log

age author description
Fri, 22 Jan 2021 04:10:44 +0100 Pierre-Yves David divergence-resolution: pass the base changeset to _pickresolutionparent
Fri, 22 Jan 2021 03:59:49 +0100 Pierre-Yves David divergence-resolution: pre-indent some code
Thu, 22 Oct 2020 21:12:50 +0530 Sushil khanchi divergence-resolution: return rev from _pickresolutionparent()