diff --git a/hgext3rd/tweakdefaults.py b/hgext3rd/tweakdefaults.py
--- a/hgext3rd/tweakdefaults.py
+++ b/hgext3rd/tweakdefaults.py
@@ -102,8 +102,6 @@
     # try to put in alphabetical order
     options.insert(3, ('', 'inactive', None,
         _('update without activating bookmarks')))
-    options.insert(3, ('n', 'nocheck', None,
-        _('update even with outstanding changes')))
     wrapblame()
 
     entry = wrapcommand(commands.table, 'commit', commitcmd)
@@ -358,18 +356,6 @@
             hint='If you\'re trying to move a bookmark forward, try ' +
                  '"hg rebase -d <destination>".')
 
-    # By default, never update when there are local changes unless updating to
-    # the current rev. This is useful for, eg, arc feature when the only
-    # thing changing is the bookmark.
-    if not kwargs['clean'] and not kwargs['nocheck'] and not kwargs['merge']:
-        target = node or rev
-        if target and scmutil.revsingle(repo, target, target).rev() != \
-                repo.revs('.').first():
-            kwargs['check'] = True
-
-    if 'nocheck' in kwargs:
-        del kwargs['nocheck']
-
     # Doesn't activate inactive bookmarks with this flag
     # In order to avoid submitting to upstream:
     #   assumes checkout not to be none
diff --git a/tests/test-tweakdefaults-update.t b/tests/test-tweakdefaults-update.t
--- a/tests/test-tweakdefaults-update.t
+++ b/tests/test-tweakdefaults-update.t
@@ -2,6 +2,8 @@
   > [extensions]
   > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
   > rebase=
+  > [experimental]
+  > updatecheck=noconflict
   > EOF
 
 Set up the repository.
@@ -34,21 +36,17 @@
   $ hg up .
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-By default, --check should be set.
-  $ hg up 2
+Abort with --check set, succeed with --merge
+  $ hg up 2 --check
   abort: uncommitted changes
   [255]
-  $ hg up --nocheck 2
+  $ hg up --merge 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Updates to other branches should fail without --merge.
-  $ hg up 4
+  $ hg up 4 --check
   abort: uncommitted changes
   [255]
-  $ hg up --nocheck 4
-  abort: uncommitted changes
-  (commit or update --clean to discard changes)
-  [255]
   $ hg up --merge 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
diff --git a/tests/test-tweakdefaults.t b/tests/test-tweakdefaults.t
--- a/tests/test-tweakdefaults.t
+++ b/tests/test-tweakdefaults.t
@@ -3,6 +3,8 @@
   > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
   > fbamend=$TESTDIR/../hgext3rd/fbamend
   > rebase=
+  > [experimental]
+  > updatecheck=noconflict
   > EOF
 
 Setup repo
@@ -59,20 +61,20 @@
   |/
   o  0 a
   
-Dirty update to different rev fails by default
+Dirty update to different rev fails with --check
 
   $ echo x >> a
   $ hg st
   M a
-  $ hg update ".^"
+  $ hg update ".^" --check
   abort: uncommitted changes
   [255]
 
-Dirty update allowed to same rev and with --nocheck and --clean
+Dirty update allowed to same rev, with no conflicts, and --clean
 
   $ hg update .
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg update --nocheck ".^"
+  $ hg update ".^"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg update --clean 1
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved