diff -r 769198c6a62d -r 7a9cbb315d84 tests/test-casecollision-merge.t --- a/tests/test-casecollision-merge.t Wed Aug 06 10:34:54 2014 -0500 +++ b/tests/test-casecollision-merge.t Wed Aug 06 11:43:59 2014 -0500 @@ -1,6 +1,4 @@ -run only on case-insensitive filesystems - - $ "$TESTDIR/hghave" icasefs || exit 80 +#require icasefs ################################ test for branch merging