Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 6746:1dca460e7d1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename checkfolding to checkcase
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jun 2008 13:58:24 -0500
parents b148e9099133
children f6c00b17387c
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Jun 26 13:58:22 2008 -0500
+++ b/mercurial/merge.py	Thu Jun 26 13:58:24 2008 -0500
@@ -460,7 +460,7 @@
         action = []
         if not force:
             _checkunknown(wc, p2)
-        if not util.checkfolding(repo.path):
+        if not util.checkcase(repo.path):
             _checkcollision(p2)
         action += _forgetremoved(wc, p2, branchmerge)
         action += manifestmerge(repo, wc, p2, pa, overwrite, partial)