Fix upstream merge conflict on 277966e9968d
Merging upstream commit 277966e9968d 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 81cb97486adbfa2b8e3c5a4d28822d6b5ef26849 && \
hg topic upstream-merge && \
hg merge 277966e9968d305175093d523d2bc320e7f898df
The topic upstream-merge
is at 72 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.