diff -r 41989e55fa37 -r fffc8a733bf9 mercurial/merge.py
--- a/mercurial/merge.py	Sun Oct 29 13:08:10 2006 +0100
+++ b/mercurial/merge.py	Tue Oct 31 13:02:49 2006 +0100
@@ -384,13 +384,9 @@
         if branchmerge:
             raise util.Abort(_("there is nothing to merge, just use "
                                "'hg update' or look at 'hg heads'"))
-    elif not branchmerge:
-        if not overwrite:
-            if wc.files():
-                raise util.Abort(_("outstanding uncommited changes, use "
-                                   "'hg update -C' to lose changes"))
-            else:
-                overwrite = True
+    elif not (overwrite or branchmerge):
+        raise util.Abort(_("update spans branches, use 'hg merge' "
+                           "or 'hg update -C' to lose changes"))
     if branchmerge and not forcemerge:
         if wc.modified() or wc.added() or wc.removed():
             raise util.Abort(_("outstanding uncommitted changes"))