Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 3593:9bfb3c049b2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with backout
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 31 Oct 2006 13:03:23 +0100
parents fffc8a733bf9 be61bd32046c
children 3109f012c305
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Oct 31 13:02:49 2006 +0100
+++ b/mercurial/merge.py	Tue Oct 31 13:03:23 2006 +0100
@@ -388,7 +388,7 @@
         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