Fix upstream merge conflict on a9db17588d9e
Merging upstream commit a9db17588d9e 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 e27411d2b06fe125464e92036625fddbd358f566 && \
hg topic upstream-merge && \
hg merge a9db17588d9e10d9d73a1bfcbab428e0876afde2
The topic upstream-merge
is at 141 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.