HomePhabricator

status: disable morestatus when using -0

Authored by martinvonz.

Description

status: disable morestatus when using -0

Without this patch, you get something like this:

M a\x00? a.orig\x00# The repository is in an unfinished *merge* state. (esc)

# Unresolved merge conflicts:
#
#     a
#
# To mark files as resolved:  hg resolve --mark FILE

# To continue:    hg commit
# To abort:       hg merge --abort

That doesn't seem like something one would ever want. I considered
making it an error to combine -0 with morestatus, but it seems very
likely that that would just make the user spend time trying to figure
out how to disable morestatus, so it feels like we might as well just
do it for them.

Differential Revision: https://phab.mercurial-scm.org/D9545

Details