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

[durin42 (Augie Fackler)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6cd8d8203204: tweakdefaults: make commands.update.check be `noconflict` (authored by durin42, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D1062?vs=2728&id=2761#toc

REPOSITORY
  rHG Mercurial

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

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