Fix upstream merge conflict on c64a71082ea4
Merging upstream commit c64a71082ea4 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 heptapod && \
hg topic upstream-merge && \
hg merge c64a71082ea4bc14ee643c79c3e17c3ee341be76
The topic upstream-merge
is at 0 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.