Fix upstream merge conflict on 9dc76f930d47
Merging upstream commit 9dc76f930d47 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 upstream-merge && \
hg topic upstream-merge && \
hg merge 9dc76f930d472af8d9c01de7fff2990660a416f5
The topic upstream-merge
is at 6 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.