hgext/largefiles/overrides.py

--- a/hgext/largefiles/overrides.py	Tue May 07 05:04:11 2013 +0900
+++ b/hgext/largefiles/overrides.py	Tue May 07 05:04:11 2013 +0900
@@ -333,7 +333,7 @@
 # largefiles. This makes the merge proceed and we can then handle this
 # case further in the overridden manifestmerge function below.
 def overridecheckunknownfile(origfn, repo, wctx, mctx, f):
-    if lfutil.standin(f) in wctx:
+    if lfutil.standin(repo.dirstate.normalize(f)) in wctx:
         return False
     return origfn(repo, wctx, mctx, f)