Fix upstream merge conflict on 4b14025c0dfe
Merging upstream commit 4b14025c0dfe 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 4b14025c0dfe284ea5ed9e8335b041868c8d156c
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.