Fix upstream merge conflict on 2186af11f015
Merging upstream commit 2186af11f015 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 c0b02bed714266fc41943b031f932959d8f7b4b5 && \
hg topic upstream-merge && \
hg merge 2186af11f015998037ab3e66a157d4731b2151d6