diff -r 8a84347b9907 -r 6f447b9ec263 mercurial/merge.py
--- a/mercurial/merge.py	Mon Aug 29 17:48:14 2016 -0700
+++ b/mercurial/merge.py	Tue Aug 30 09:22:53 2016 -0700
@@ -1586,7 +1586,7 @@
                 actions[m] = []
             actions[m].append((f, args, msg))
 
-        if not util.checkcase(repo.path):
+        if not util.fscasesensitive(repo.path):
             # check collision between files only in p2 for clean update
             if (not branchmerge and
                 (force or not wc.dirty(missing=True, branch=False))):