Fix upstream merge conflict on 1fa205ac0ffd
Merging upstream commit 1fa205ac0ffd 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 4a9097ac2f939b0d1564e77333d9f6e82050701c && \
hg topic upstream-merge && \
hg merge 1fa205ac0ffd6368a66ba8c118f8fd6f69fe951b
The topic upstream-merge
is at 140 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.