Fix upstream merge conflict on ba64887a51bd
Merging upstream commit ba64887a51bd 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 36afc1ce86f7f320e2261528cbf88157516ad88d && \
hg topic upstream-merge && \
hg merge ba64887a51bdd6a7a227f353bd86055cda2cc7d8
The topic upstream-merge
is at 3 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.