Fix upstream merge conflict on a43c0a67775b
Merging upstream commit a43c0a67775b 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 b8302cb192e1b469ece267f1bd1cc8a5c31f6f8e && \
hg topic upstream-merge && \
hg merge a43c0a67775bb7b27857fd5baa5a69ceeef50898
The topic upstream-merge
is at 122 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.