changeset 2874 | 3d6efcbbd1c9 |
parent 2850 | b11c014dcbd9 |
child 2899 | bee4b7abcb01 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -75,7 +75,7 @@ def update(repo, node, branchmerge=False 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"))