Fix upstream merge conflict on aae3b8a45de1
Merging upstream commit aae3b8a45de1 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 68640457b269016eee564566084b91f01daf5b09 && \
hg topic upstream-merge && \
hg merge aae3b8a45de1525b4f8d107f431f8fdf656c4729
The topic upstream-merge
is at 224 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.