log tests/test-divergent.t @ 3900:05cb942cb9b9 stable

age author description
Tue, 16 Jan 2018 04:32:43 +0100 Pierre-Yves David branching: merge stable back into default
Tue, 16 Jan 2018 04:35:34 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.3 mercurial-4.3
Mon, 15 Jan 2018 19:52:00 +0100 Pierre-Yves David branching: backed out test output changes from core-1905aac253f0 stable
Fri, 05 Jan 2018 09:23:09 +0100 Boris Feld test: update output to 9b3f95d9783d
Wed, 01 Nov 2017 23:57:56 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.3 mercurial-4.3
Thu, 26 Oct 2017 09:02:25 +0200 Pierre-Yves David evolve: rename --contentdivergent flag to --content-divergent
Fri, 20 Oct 2017 20:04:13 +0200 Pierre-Yves David test-compat: revert output changes from phase renaming mercurial-4.3
Fri, 20 Oct 2017 19:32:18 +0200 Pierre-Yves David test-compat: revert output changes related to temporary amend commit mercurial-4.3
Wed, 27 Sep 2017 16:26:30 +0200 Pierre-Yves David packaging: merge stable back into default
Wed, 27 Sep 2017 00:54:28 +0200 Pierre-Yves David branching: merge future 6.7.0 in the stable branch stable
Fri, 15 Sep 2017 15:48:18 +0200 Boris Feld tests: update after removing of redundant amend commit
Thu, 24 Aug 2017 10:57:32 -0700 Martin von Zweigbergk messages: use hyphenated '{phase,content}-divergent' in user messages
Thu, 24 Aug 2017 09:12:09 +0200 Boris Feld warning: rename warning message
Thu, 10 Aug 2017 17:57:50 +0200 Boris Feld log: divergent was renamed into contentdivergent
Mon, 24 Jul 2017 04:41:31 +0200 Pierre-Yves David test: remove reference to the graphlog extension
Tue, 28 Feb 2017 15:09:03 +0100 Pierre-Yves David evolve: move the extensions to 'hgext3rd'
Fri, 06 May 2016 00:08:31 +0200 Pierre-Yves David merge with stable through 3.5 branch mercurial-3.4
Thu, 17 Mar 2016 15:04:05 -0700 Juntao Li evolve: Fix crush when reading docstring
Thu, 11 Feb 2016 00:32:40 +0000 Pierre-Yves David merge with new stable through 3.5 and 3.6 mercurial-3.4
Tue, 17 Nov 2015 17:06:07 -0800 Laurent Charignon evolve: evolve --divergent failed when merge had nothing to do (issue4950)
Wed, 24 Jun 2015 16:54:23 -0700 Laurent Charignon evolve: dedupe divergents when running evolve --all --any or evolve --rev stable