Fix upstream merge conflict on ad41a4b7b5b2
Merging upstream commit ad41a4b7b5b2 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 ad41a4b7b5b23a3631e6dfb8c8384475662a818a
The topic upstream-merge
is at 20 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.