Fix upstream merge conflict on ab7ff766fbc3
Merging upstream commit ab7ff766fbc3 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 bf154bf8abbc2a10703cd7390a286cc531f26dd1 && \
hg topic upstream-merge && \
hg merge ab7ff766fbc3acb3498aba9e94fd3042d592d2f2
The topic upstream-merge
is at 5 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.