Fix upstream merge conflict on 02c84c0eca3c
Merging upstream commit 02c84c0eca3c 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 995edd9a7cdd0d960eefac735cef3b2acb99e749 && \
hg topic upstream-merge && \
hg merge 02c84c0eca3c3b49c616d89f9bc48e368e372a72
The topic upstream-merge
is at 294 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.