log tests/test-evolve-issue5966.t @ 5190:d2e0e6447a73

age author description
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
Wed, 05 Jun 2019 17:56:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Wed, 24 Apr 2019 17:02:27 +0800 Anton Shestakov tests: add --rev to hg evolve to reduce test changes for the next patch
Wed, 24 Apr 2019 15:59:02 +0200 Anton Shestakov evolve: don't update after instability resolution by default (BC)
Tue, 22 Jan 2019 12:57:25 -0500 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Mon, 24 Dec 2018 17:47:40 +0100 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Mon, 24 Dec 2018 17:47:31 +0100 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 21 Dec 2018 13:14:59 +0800 Pierre-Yves David evolve: detect unresolved conflict during evolve --continue (issue5966) stable