Patchwork D2806: tweakdefaults: add commands.status.verbose to tweakefaults

login
register
mail settings
Submitter phabricator
Date March 12, 2018, 9:43 p.m.
Message ID <dc04e621e5e62858f5922c6c48668139@localhost.localdomain>
Download mbox | patch
Permalink /patch/29407/
State Not Applicable
Headers show

Comments

phabricator - March 12, 2018, 9:43 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG98487ad0cf8b: tweakdefaults: add commands.status.verbose to tweakefaults (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2806?vs=6868&id=6963

REVISION DETAIL
  https://phab.mercurial-scm.org/D2806

AFFECTED FILES
  mercurial/ui.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, durin42
Cc: mercurial-devel

Patch

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -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