Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Apr 2012 06:47:41 +0000 (07:47 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Apr 2012 06:47:41 +0000 (07:47 +0100)
Conflicts:
tests/typecheck/should_fail/all.T

1  2 
testsuite/tests/typecheck/should_fail/all.T

@@@ -268,4 -268,8 +268,9 @@@ test('T3592', normal, compile_fail, [''
  test('T5570', normal, compile_fail, [''])
  test('T5573a', normal, compile_fail, [''])
  test('T5573b', normal, compile_fail, [''])
 +test('T5691', normal, compile_fail, [''])
+ test('T5689', normal, compile_fail, [''])
+ test('T5684', normal, compile_fail, [''])
+ test('T5858', normal, compile_fail, [''])
+ test('T5957', normal, compile_fail, [''])
+ test('T6001', normal, compile_fail, [''])