changeset 36910 | 98487ad0cf8b |
parent 36834 | 1527f40de3b3 |
child 37084 | f0b6fbea00cf |
--- 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