Fix upstream merge conflict on 75df361ab6af
Merging upstream commit 75df361ab6af 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 336ddb1c26fbf3628309aa822a5124ab2996e370 && \
hg topic upstream-merge && \
hg merge 75df361ab6af1e3c0d885e00f797c9674fce7559