Fix upstream merge conflict on 63c0daf3ac43
Merging upstream commit 63c0daf3ac43 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 c69e066513243e83f0f87798b8978d6363ae79b5 && \
hg topic upstream-merge && \
hg merge 63c0daf3ac439f4bdaf251507d39be99f0d98f44