Fix upstream merge conflict on 56ede1d325b3
Merging upstream commit 56ede1d325b3 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 2d2c9e2c2ed41748e24a9a4b51e0dbe4c6bea9ea && \
hg topic upstream-merge && \
hg merge 56ede1d325b37252d10c6b7dcb51e29783d88eed
The topic upstream-merge
is at 24 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.