Fix upstream merge conflict on 33bfd6e8bfda
Merging upstream commit 33bfd6e8bfda 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 6b74c2a71d0bef25b539791810a15e8e012ffd45 && \
hg topic upstream-merge && \
hg merge 33bfd6e8bfda3a4c46291543e83e74d9ed122ee9
The topic upstream-merge
is at 375 non-merge commits
before potential MR creation, depending on current options of the upstream
merge process.