Fix upstream merge conflict on 17e06e386633
Merging upstream commit 17e06e386633 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 99ef3902d5cb075f1127c1abe7514833664cfeb3 && \
hg topic upstream-merge && \
hg merge 17e06e38663303fe26f5826c473512a91ec45e04
The topic upstream-merge
is at 84 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.