Tue, 02 Feb 2021 15:35:58 +0100 ci-fix: backed out changeset 45afff0f530a
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 02 Feb 2021 15:35:58 +0100] rev 46456
ci-fix: backed out changeset 45afff0f530a This changeset is part of a series that break Continuous integration on python 2 for about a week. As not concrete solution have been found so far the safer seems to back it out until we can figure the details out. Differential Revision: https://phab.mercurial-scm.org/D9948
Tue, 02 Feb 2021 15:35:38 +0100 ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 02 Feb 2021 15:35:38 +0100] rev 46455
ci-fix: backed out changeset d4c8b4b90ecb This changeset is part of a series that break Continuous integration on python 2 for about a week. As not concrete solution have been found so far the safer seems to back it out until we can figure the details out. Differential Revision: https://phab.mercurial-scm.org/D9947
Mon, 01 Feb 2021 17:13:24 -0500 relnotes: add entry for `hg diff --merge -c`
Augie Fackler <augie@google.com> [Mon, 01 Feb 2021 17:13:24 -0500] rev 46454
relnotes: add entry for `hg diff --merge -c` Differential Revision: https://phab.mercurial-scm.org/D9944
Mon, 01 Feb 2021 12:55:53 -0800 branching: merge with stable
Martin von Zweigbergk <martinvonz@google.com> [Mon, 01 Feb 2021 12:55:53 -0800] rev 46453
branching: merge with stable
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 tip