Fix upstream merge conflict on f3314dfaf9d1
Merging upstream commit f3314dfaf9d1 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 52846732b748e4a9b84efb2d5349ab64a6716dbe && \
hg topic upstream-merge && \
hg merge f3314dfaf9d177158b987d708043e083dd7ad399
The topic upstream-merge
is at 115 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.