Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/d961a51919530cc95276f0469e255fa5475c0ac2 >--------------------------------------------------------------- commit d961a51919530cc95276f0469e255fa5475c0ac2 Merge: 349493e... 7f9bd37... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Mon Dec 24 14:07:04 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/testsuite Conflicts: tests/typecheck/should_fail/all.T tests/rename/should_fail/rnfail055.stderr | 2 +- tests/typecheck/should_fail/T7368a.hs | 14 ++++++++++++++ tests/typecheck/should_fail/T7368a.stderr | 10 ++++++++++ tests/typecheck/should_fail/all.T | 1 + 4 files changed, 26 insertions(+), 1 deletions(-) diff --cc tests/typecheck/should_fail/all.T index 168dc16,5899413..644ab38 --- a/tests/typecheck/should_fail/all.T +++ b/tests/typecheck/should_fail/all.T @@@ -289,4 -289,4 +289,5 @@@ test('T6069', normal, compile_fail, ['' test('T7220', normal, compile_fail, ['']) test('T7410', normal, compile_fail, ['']) test('T7453', normal, compile_fail, ['']) +test('T7525', normal, compile_fail, ['']) + test('T7368a', normal, compile_fail, ['']) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
