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