Fix upstream merge conflict on fe10074d0173
Merging upstream commit fe10074d0173 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 bd5632b4a49f7b4b0f979cfb6181e11d17e63fcc && \
hg topic upstream-merge && \
hg merge fe10074d017364cb82394e244772e53c224c578a