--- a/mercurial/merge.py	Sun Oct 29 13:08:10 2006 +0100
+++ b/mercurial/merge.py	Sun Oct 29 14:18:55 2006 +0100
@@ -392,7 +392,7 @@
             else:
                 overwrite = True
     if branchmerge and not forcemerge:
-        if wc.modified() or wc.added() or wc.removed():
+        if wc.files():
             raise util.Abort(_("outstanding uncommitted changes"))
 
     ### calculate phase