Patchwork D1062: tweakdefaults: make commands.update.check be `noconflict`

login
register
mail settings
Submitter phabricator
Date Oct. 14, 2017, 7:15 a.m.
Message ID <a8f9a796276dd64b6deb92c46b900919@localhost.localdomain>
Download mbox | patch
Permalink /patch/24886/
State Not Applicable
Headers show

Comments

phabricator - Oct. 14, 2017, 7:15 a.m.
durin42 updated this revision to Diff 2728.
durin42 edited the summary of this revision.
durin42 retitled this revision from "tweakdefaults: make experimental.updatecheck be `noconflict`" to "tweakdefaults: make commands.update.check be `noconflict`".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1062?vs=2701&id=2728

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

AFFECTED FILES
  mercurial/ui.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -53,6 +53,8 @@ 
 [commands]
 # Make `hg status` emit cwd-relative paths by default.
 status.relative = yes
+# Refuse to perform an `hg update` that would cause a file content merge
+update.check=noconflict
 
 [diff]
 git = 1