Fix upstream merge conflict on 061beab0362a
Merging upstream commit 061beab0362a 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 59ce73e76649ad3f75002d89880837f5c8b522e1 && \
hg topic upstream-merge && \
hg merge 061beab0362a3df39424eda9bd4f2bf28ce7e32b
The topic upstream-merge
is at 168 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.