Mercurial > hg-stable
changeset 36916: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
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sat, 10 Mar 2018 15:24:24 +0530 |
| parents | 84110a1d0f7d |
| children | f0a851542a05 |
| files | mercurial/ui.py |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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