Fix upstream merge conflict on 0806afdff68c
Merging upstream commit 0806afdff68c 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 d255a1616675f890f150770e66bb66edefd40722 && \
hg topic upstream-merge && \
hg merge 0806afdff68c2a0a4baec4aade83377751859296
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.