Fix upstream merge conflict on 1ca457f42e32
Merging upstream commit 1ca457f42e32 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 ab6178c62c9649dabd5440bc5e96854f7208592f && \
hg topic upstream-merge && \
hg merge 1ca457f42e32907c43a26ae408161764e35be0ae
The topic upstream-merge
is at 17 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.