diff mercurial/merge.py @ 15655:5402fd9dd13e

merge with stable

--- a/mercurial/merge.py	Thu Dec 15 13:57:54 2011 +0100
+++ b/mercurial/merge.py	Thu Dec 15 14:37:36 2011 -0600
@@ -7,7 +7,7 @@
 
 from node import nullid, nullrev, hex, bin
 from i18n import _
-import scmutil, util, filemerge, copies, subrepo, encoding
+import scmutil, util, filemerge, copies, subrepo
 import errno, os, shutil
 
 class mergestate(object):
@@ -100,7 +100,7 @@
     "check for case folding collisions in the destination context"
     folded = {}
     for fn in mctx:
-        fold = encoding.lower(fn)
+        fold = util.normcase(fn)
         if fold in folded:
             raise util.Abort(_("case-folding collision between %s and %s")
                              % (fn, folded[fold]))