Fix upstream merge conflict on 4dd3d0ac83fc
Merging upstream commit 4dd3d0ac83fc 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 e0f6e44a6c03fc5c54ed4d156785ebf1f41b19da && \
hg topic upstream-merge && \
hg merge 4dd3d0ac83fc941df76d7fdf97ee3829ca168710
The topic upstream-merge
is at 3 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.