comparison mercurial/py3kcompat.py @ 16284:2b0a406d3043

merge: fix unknown file merge detection for case-folding systems This was triggering some test failures on Mac.
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Mar 2012 16:41:54 -0500
parents 8bb1481cf08f
children e7cfe3587ea4
comparison
equal deleted inserted replaced
16279:531e69ff348f 16284:2b0a406d3043