Fix upstream merge conflict on 863f98170aee
Merging upstream commit 863f98170aee 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 35161b6a1d1fb3248a171c3ef77e5ce2e6428216 && \
hg topic upstream-merge && \
hg merge 863f98170aee0aea8e3f958e0c4bbf596a2a27c7
The topic upstream-merge
is at 31 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.