diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -54,6 +54,9 @@
 # Make `hg status` emit cwd-relative paths by default.
 status.relative = yes
 
+[experimental]
+updatecheck=noconflict
+
 [diff]
 git = 1
 """