diff options
author | Alejandro Serrano <trupill@gmail.com> | 2015-07-27 17:05:10 +0200 |
---|---|---|
committer | Alejandro Serrano <trupill@gmail.com> | 2015-07-27 17:05:10 +0200 |
commit | a87bb2b35a9af784de688fe50cc2daea3090f5de (patch) | |
tree | d240e225f7a0754f58302f25f79cecb409981775 /testsuite/tests/rename/should_fail/all.T | |
parent | 6b05f0c574a5067cbd6db5909e34d66c3512aa8f (diff) | |
parent | 474d4ccc6e4a3bea93be16cb7daef6ffcdf9b663 (diff) | |
download | haskell-a87bb2b35a9af784de688fe50cc2daea3090f5de.tar.gz |
Merge remote-tracking branch 'origin/master' into wip/impredicativity
Conflicts:
compiler/typecheck/Inst.hs
compiler/typecheck/TcBinds.hs
compiler/typecheck/TcExpr.hs
compiler/typecheck/TcRnTypes.hs
compiler/types/Unify.hs
Diffstat (limited to 'testsuite/tests/rename/should_fail/all.T')
-rw-r--r-- | testsuite/tests/rename/should_fail/all.T | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T index bfd81c51f9..80471a6960 100644 --- a/testsuite/tests/rename/should_fail/all.T +++ b/testsuite/tests/rename/should_fail/all.T @@ -134,3 +134,4 @@ test('T9032', run_command, ['$MAKE -s --no-print-directory T9032']) test('T10618', normal, compile_fail, ['']) +test('T10668', normal, compile_fail, ['']) |