D2806: tweakdefaults: add commands.status.verbose to tweakefaults
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Mon Mar 12 17:43:35 EDT 2018
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
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
To: pulkit, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list