diff -r 4ec58b157265 -r 3d6efcbbd1c9 mercurial/merge.py
--- a/mercurial/merge.py	Sat Aug 12 16:13:27 2006 -0700
+++ b/mercurial/merge.py	Sat Aug 12 16:40:12 2006 -0700
@@ -75,7 +75,7 @@
         raise util.Abort(_("update spans branches, use 'hg merge' "
                            "or 'hg update -C' to lose changes"))
 
-    modified, added, removed, deleted, unknown = repo.changes()
+    modified, added, removed, deleted, unknown = repo.status()[:5]
     if branchmerge and not forcemerge:
         if modified or added or removed:
             raise util.Abort(_("outstanding uncommitted changes"))