Fix upstream merge conflict on 036ab0ba5ba3
Merging upstream commit 036ab0ba5ba3 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 b578aba043c40d5941c47bed3694464703fe72e8 && \
hg topic upstream-merge && \
hg merge 036ab0ba5ba3a939a3a1b2269a78a6665e53f864
The topic upstream-merge
is at 217 non-merge commits.