Fix upstream merge conflict on bab0fdf51b8f
Merging upstream commit bab0fdf51b8f 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 b79c2b1d95f7a75b904d91ff757aeaaef3ecb920 && \
hg topic upstream-merge && \
hg merge bab0fdf51b8ff31b677223e3bffeed2f3a5d2e84