# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1162127935 -3600
# Node ID be61bd32046ca4b9248b255d37d5aa6155570913
# Parent  41989e55fa375de4376e7e64b17e38312e8ec140
use workingcontext.files() to detect if the repo is unclean

diff -r 41989e55fa37 -r be61bd32046c mercurial/merge.py
--- a/mercurial/merge.py	Sun Oct 29 13:08:10 2006 +0100
+++ b/mercurial/merge.py	Sun Oct 29 14:18:55 2006 +0100
@@ -392,7 +392,7 @@
             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