Fix upstream merge conflict on e9afdaa823e6
Merging upstream commit e9afdaa823e6 gives a conflict.
A human being has to perform merge and resolution for the automatic merge process to resume.
Command for clean conflict reproduction:
hg pull
hg --config command.update.check=abort update ec6d40834c1e1791b0cdf6866030ac80d0804295 && \
hg topic upstream-merge && \
hg merge e9afdaa823e6cfa53cc89bba30597647f72f580d
The topic upstream-merge
is at 152 non-merge commits
before potential MR creation, depending on current options of the upstream
merge process.