log

age author description
Tue, 26 Jan 2021 17:14:29 +0100 Pierre-Yves David branching: merge with stable
Fri, 22 Jan 2021 05:37:43 +0100 Sushil khanchi divergence-resolution: deal with simple "just one moved case" earlier
Fri, 22 Jan 2021 04:54:51 +0100 Pierre-Yves David divergence-resolution: remove explicite hash in some command
Fri, 22 Jan 2021 04:24:05 +0100 Pierre-Yves David divergence-resolution: clarify some test case
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()