log tests/test-evolve-orphan-merge.t @ 3901:f2b8429db565 stable

age author description
Sun, 22 Apr 2018 11:40:17 +0200 Pierre-Yves David evolve: point to '--abort' in error message
Wed, 21 Mar 2018 16:18:31 +0100 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Wed, 21 Mar 2018 16:06:17 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.4 mercurial-4.4
Sun, 18 Mar 2018 17:29:32 +0530 Pulkit Goyal evolve: handle stabilization of merge changeset with both parents obsoleted
Mon, 19 Mar 2018 12:58:31 +0530 Pulkit Goyal evolve: preserve the order of merge parents in `hg evolve --continue`
Mon, 19 Mar 2018 14:03:41 +0100 Pulkit Goyal tests: add more cases about stabilization of an orphaned merge commit
Tue, 13 Mar 2018 19:06:14 +0530 Pulkit Goyal tests: add more tests related to stabilization of orphaned merge commit
Tue, 13 Mar 2018 18:17:50 +0530 Pulkit Goyal evolve: fix stabilization of orphan merge changesets in case of conflicts
Tue, 13 Mar 2018 15:29:35 +0530 Pulkit Goyal tests: add a test file of resolving orphaness of merge changesets