log tests/test-evolve-content-divergent-case-A5.t @ 6401:716912541759 mercurial-5.0

age author description
Thu, 11 Mar 2021 12:29:50 +0800 Anton Shestakov test-compat: merge stable into mercurial-5.6 mercurial-5.6
Fri, 22 Jan 2021 05:37:43 +0100 Sushil khanchi divergence-resolution: take parent successors in account
Thu, 28 Jan 2021 13:40:36 +0530 Sushil khanchi divergence-resolution: add a buggy test case for resolution