Fix upstream merge conflict on ca17e5df5fed
Merging upstream commit ca17e5df5fed 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 9e921213e4bb2517fecec77aa737efddb59a8531 && \
hg topic upstream-merge && \
hg merge ca17e5df5fed4ba661a92acc53428021d618b38d
The topic upstream-merge
is at 201 non-merge commits
before potential MR creation, depending on current options of the upstream
merge process.