log tests/test-evolve-content-divergent-first-changeset.t @ 6272:cfdbbed669b5 stable

age author description
Fri, 08 May 2020 18:22:26 +0800 Anton Shestakov branching: merge into stable in preparation for release stable
Fri, 08 May 2020 04:02:22 +0200 Pierre-Yves David evolve: rename `evolve_source_*` to `divergence_source_*`
Thu, 30 Apr 2020 10:05:14 -0700 Martin von Zweigbergk evolve: always create commit when resolving divergence
Wed, 04 Mar 2020 15:47:08 +0100 Pierre-Yves David branching: preserve test change on stable
Sat, 29 Feb 2020 15:18:00 +0700 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Fri, 28 Feb 2020 20:18:42 +0700 Anton Shestakov branching: merge into stable in preparation for release stable
Sat, 01 Feb 2020 12:50:10 +0100 Pierre-Yves David branching
Thu, 23 Jan 2020 17:40:59 +0700 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Thu, 23 Jan 2020 18:19:36 +0700 Anton Shestakov tests: use --tool flag instead of --config ui.merge stable
Mon, 04 Nov 2019 01:30:50 +0530 Sushil khanchi evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Fri, 06 Dec 2019 14:01:29 +0100 Manuel Jacob evolve: fix content-divergence resolution when p1 is null (issue6201) stable