# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1520675664 -19800
# Node ID 98487ad0cf8bd8ca3e0f8395033843f80600d2d1
# Parent  84110a1d0f7dd1d43f82c9ca5b214ceccc042c67
tweakdefaults: add commands.status.verbose to tweakefaults

commands.status,verbose if set to True, shows conflict information in `hg
status`. It shows which unresolved state you are in, which are the unresolved
files and how to continue the unresolved state. That sounds like a very good
candidate for tweakdefaults.

bisect is added to commands.status.skipstates because people generally leave
unresolved bisect state and we should skip that in morestatus output.

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

diff -r 84110a1d0f7d -r 98487ad0cf8b mercurial/ui.py
--- a/mercurial/ui.py	Sun Mar 11 16:19:20 2018 -0700
+++ b/mercurial/ui.py	Sat Mar 10 15:24:24 2018 +0530
@@ -60,6 +60,10 @@
 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