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

[durin42 (Augie Fackler)]

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

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



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