Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add commands.resolve.mark-check=abort to tweakdefaults
authorKyle Lippincott <spectral@google.com>
Fri, 03 Aug 2018 12:59:01 -0700
changeset 38858 e9740c07158d
parent 38857 96d0795bd0bd
child 38859 db03e5cefc82
resolve: add commands.resolve.mark-check=abort to tweakdefaults Differential Revision: https://phab.mercurial-scm.org/D4072
mercurial/ui.py file | annotate | diff | comparison | revisions 
--- a/mercurial/ui.py	Fri Aug 03 12:57:44 2018 -0700
+++ b/mercurial/ui.py	Fri Aug 03 12:59:01 2018 -0700
@@ -67,6 +67,9 @@
 update.check = noconflict
 # Show conflicts information in `hg status`
 status.verbose = True
+# Refuse to perform `hg resolve --mark` on files that still have conflict
+# markers
+resolve.mark-check = abort
 
 [diff]
 git = 1
mercurial