Fix upstream merge conflict on ecad5adcb753
Merging upstream commit ecad5adcb753 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 ecad5adcb75346971e91793fe61d191d9c7233d3
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.