Merge branch 'master' of http://darcs.haskell.org/testsuite
authorDimitrios.Vytiniotis <dimitris@microsoft.com>
Fri, 8 Jun 2012 15:13:56 +0000 (16:13 +0100)
committerDimitrios.Vytiniotis <dimitris@microsoft.com>
Fri, 8 Jun 2012 15:13:56 +0000 (16:13 +0100)
Conflicts:
tests/typecheck/should_compile/all.T

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

@@@ -379,6 -379,4 +379,6 @@@ test('T5792',normal,run_command
  test('PolytypeDecomp', normal, compile, [''])
  test('T6011', normal, compile, [''])
  test('T6055', normal, compile, [''])
 +test('DfltProb1', normal, compile, [''])
 +test('DfltProb2', normal, compile, [''])
+ test('T6134', normal, compile, [''])