changeset 3593 | 9bfb3c049b2a |
parent 3592 | fffc8a733bf9 |
parent 3581 | be61bd32046c |
child 3620 | 3109f012c305 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -388,7 +388,7 @@ def update(repo, node, branchmerge, forc raise util.Abort(_("update spans branches, use 'hg merge' " "or 'hg update -C' to lose changes")) 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