comparison mercurial/ui.py @ 36910:98487ad0cf8b

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

36909:84110a1d0f7d

[commands]
# Make `hg status` emit cwd-relative paths by default.
status.relative = yes
# Refuse to perform an `hg update` that would cause a file content merge
update.check = noconflict

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

36910:98487ad0cf8b

[commands]
# Make `hg status` emit cwd-relative paths by default.
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
"""