Patchwork D4072: resolve: add commands.resolve.mark-check=abort to tweakdefaults

login
register
mail settings
Submitter phabricator
Date Aug. 4, 2018, 5:13 p.m.
Message ID <e94b5baad4d57b0f33336409d915af6f@localhost.localdomain>
Download mbox | patch
Permalink /patch/33238/
State Not Applicable
Headers show

Comments

phabricator - Aug. 4, 2018, 5:13 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe9740c07158d: resolve: add commands.resolve.mark-check=abort to tweakdefaults (authored by spectral, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4072?vs=9834&id=9902

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

AFFECTED FILES
  mercurial/ui.py

CHANGE DETAILS




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

Patch

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