Fix upstream merge conflict on 05b5656ea7e2
Merging upstream commit 05b5656ea7e2 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 65dab88732e4bbc1a360180022e3bb52437cf299 && \
hg topic upstream-merge && \
hg merge 05b5656ea7e29f3d85c16d5d3eccb5c8c81b0360
The topic upstream-merge
is at 104 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.