# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1507924734 14400
# Node ID 6cd8d8203204092282ab87a13a079d21d509cf16
# Parent  8782076874f5ebf5bd7f07e4ea69a7ef4e0fe74c
tweakdefaults: make commands.update.check be `noconflict`

This is the second-safest option we have to offer in `updatecheck`,
with `abort` being the safest and `linear` being the default. At the
sprint we discussed how much `none` and `linear` make us all
uncomfortable, and how we'd like to move the default behavior if we can.

I'm not sure we can get away with actually changing the out of the box
default behavior, but we can at *least* do this.

Differential Revision: https://phab.mercurial-scm.org/D1062

diff -r 8782076874f5 -r 6cd8d8203204 mercurial/ui.py
--- a/mercurial/ui.py	Sat Oct 14 15:43:06 2017 -0400
+++ b/mercurial/ui.py	Fri Oct 13 15:58:54 2017 -0400
@@ -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