This instance will be upgraded to Heptapod 0.19.0rc2 on 2021-01-18 at 11:00 UTC+1 (a few minutes of downtime)

fold: allow folding merge commits in a way that avoids issue6332

We don't create a merge where one of the parent is an ancestor of the other
parent: in such case, we just take the last parent and turn the merge commit
into a regular commit (with one parent).

--HG--
branch : stable
7 jobs for topic/stable/fold-merges in 3 minutes and 57 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
passed #88347
doc

00:00:42

passed #88341
flake8

00:00:38

manual #88342
allowed to fail manual
pytype
passed #88343
tests-py2-cext

00:03:57

passed #88344
tests-py2-pure

00:03:32

passed #88345
tests-py3-cext

00:03:53

passed #88346
tests-py3-pure

00:02:15