pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
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.
diff --git 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
git = 1
To: pulkit, #hg-reviewers
Mercurial-devel mailing list