Fix upstream merge conflict on 34b080cb48d3
Merging upstream commit 34b080cb48d3 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 b395d79990e2304aed3632ade81285b6f4e17960 && \
hg topic upstream-merge && \
hg merge 34b080cb48d3b6838144dca1a256ecaf08957eb9
The topic upstream-merge
is at 170 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.