Fix upstream merge conflict on 36668263c59d
Merging upstream commit 36668263c59d 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 5da17a5fb4a7de5d05efbc3fa875dec7abb07615 && \
hg topic upstream-merge && \
hg merge 36668263c59dd32fbae684a316e1cde6d94454f0