Fix upstream merge conflict on 5a2f260f7d88
Merging upstream commit 5a2f260f7d88 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 878df7c525968559b0b179ceb3b1a3d87f2ab249 && \
hg topic upstream-merge && \
hg merge 5a2f260f7d88dc2f6e2b954c5302bc8e235caebe
The topic upstream-merge
is at 288 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.