comparison mercurial/ui.py @ 37917:c6904da6ab15

tweakdefaults: remove "bisect" from commands.status.skipstates

If you forget to clear bisect state after you're done bisecting (as
I've done twice in the last week or so), the next time you run `hg
bisect --good/--bad`, it's going to tell you "The first bad revision
is:" etc. It's probably not obvious to new users what's going on, and
having the verbose output about an ongoing bisection will probably
help them, so let's turn it back on by default.

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

37916:34f259a1c153

status.relative = yes
# Refuse to perform an `hg update` that would cause a file content merge
update.check = noconflict
# Show conflicts information in `hg status`
status.verbose = True
# Skip the bisect state in conflicts information in `hg status`
status.skipstates = bisect

[diff]
git = 1
showfunc = 1
"""

37917:c6904da6ab15

status.relative = yes
# Refuse to perform an `hg update` that would cause a file content merge
update.check = noconflict
# Show conflicts information in `hg status`
status.verbose = True

[diff]
git = 1
showfunc = 1
"""