# HG changeset patch # User Martin von Zweigbergk # Date 2018-05-09 20:46:31 # Node ID c6904da6ab15e460862db7f91ce90c0369aff106 # Parent 34f259a1c153674a5981f9bb5d6a80449e652c1c 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 diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -66,8 +66,6 @@ status.relative = yes 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