Fix upstream merge conflict on 0520bc79a820
Merging upstream commit 0520bc79a820 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 39972c73d0d0deef4b88fb0927e1beba3962bac1 && \
hg topic upstream-merge && \
hg merge 0520bc79a820aa1bc4b9692acf00e9b2c40ef949
The topic upstream-merge
is at 14 non-merge commits.
A merge request may have already been submitted, depending on current options of the upstream merge process. If that is the case, wait for it to complete successfully before resolving the conflict.