author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Sun, 29 Oct 2006 14:18:55 +0100 | |
changeset 3581 | be61bd32046c |
parent 3580 | 41989e55fa37 |
child 3582 | 9fb7d3a05882 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -392,7 +392,7 @@ def update(repo, node, branchmerge, forc 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