Mercurial > hg

diff mercurial/merge.py @ 2886:bee4b7abcb01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Aug 2006 14:42:15 -0500
parents 06c05c675a35 3d6efcbbd1c9
children 95cc73523983
line wrap: on
line diff
--- 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"))