Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/ui.py @ 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 | 1527f40de3b3 |
| children | f0b6fbea00cf |
comparison
equal
deleted
inserted
replaced
| 36915:84110a1d0f7d | 36916:98487ad0cf8b |
|---|---|
| 58 [commands] | 58 [commands] |
| 59 # Make `hg status` emit cwd-relative paths by default. | 59 # Make `hg status` emit cwd-relative paths by default. |
| 60 status.relative = yes | 60 status.relative = yes |
| 61 # Refuse to perform an `hg update` that would cause a file content merge | 61 # Refuse to perform an `hg update` that would cause a file content merge |
| 62 update.check = noconflict | 62 update.check = noconflict |
| 63 # Show conflicts information in `hg status` | |
| 64 status.verbose = True | |
| 65 # Skip the bisect state in conflicts information in `hg status` | |
| 66 status.skipstates = bisect | |
| 63 | 67 |
| 64 [diff] | 68 [diff] |
| 65 git = 1 | 69 git = 1 |
| 66 showfunc = 1 | 70 showfunc = 1 |
| 67 """ | 71 """ |