Fix upstream merge conflict on 029eb52ab35e
Merging upstream commit 029eb52ab35e 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 upstream-merge && \
hg topic upstream-merge && \
hg merge 029eb52ab35e8fefbd48e8c9c553af37a005460d
The topic upstream-merge
is at 251 non-merge commits
before potential MR creation, depending on current options of the upstream
merge process.