Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Apr 2012 21:14:02 +0000 (22:14 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Apr 2012 21:14:02 +0000 (22:14 +0100)
Conflicts:
tests/polykinds/all.T

1  2 
testsuite/tests/polykinds/all.T

@@@ -31,4 -31,4 +31,5 @@@ test('T5881', normal, run_command, ['$M
  test('T5716', normal, compile_fail, [''])
  test('T5937', normal, compile, [''])
  test('T5935', normal, compile, [''])
 +test('T5938', normal, compile, [''])
+ test('T5948', normal, compile, [''])