Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 2886 bee4b7abcb01
parent 2842 06c05c675a35
parent 2875 3d6efcbbd1c9
child 2891 95cc73523983 
--- a/mercurial/merge.py	Mon Aug 14 14:14:08 2006 -0500
+++ b/mercurial/merge.py	Mon Aug 14 14:42:15 2006 -0500
@@ -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"))
mercurial