Fix upstream merge conflict on f2137495f052
Merging upstream commit f2137495f052 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 554a2f268ac4bb28414079f0c25bdddeba4c19ae && \
hg topic upstream-merge && \
hg merge f2137495f0524714edf50e3af1d4b657d7454e09