Fix upstream merge conflict on f73a13590609
Merging upstream commit f73a13590609 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 520e005b725203f81bc0afdf87b1f59f154fcd39 && \
hg topic upstream-merge && \
hg merge f73a135906094f13f31f98312d18aa7a5e094c6c
The topic upstream-merge
is at 30 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.