diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-01 17:41:04 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-01 17:41:04 -0800 |
| commit | 3dd9b3683b10edcf4f58ba1d98d4914c04614d87 (patch) | |
| tree | 6be6c0f233b67595c306b37fde1cf3e08252efc8 /test/files/neg/t6963b.flags | |
| parent | ccaa65a4969572631746d40d35bcd1fcfcaa51a9 (diff) | |
| parent | b403234a27518f35acc360bfa0333b00fdc85175 (diff) | |
| download | scala-3dd9b3683b10edcf4f58ba1d98d4914c04614d87.tar.gz scala-3dd9b3683b10edcf4f58ba1d98d4914c04614d87.tar.bz2 scala-3dd9b3683b10edcf4f58ba1d98d4914c04614d87.zip | |
Merge commit 'b403234a27' into wip/fresh-merge2
Conflicts:
src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
test/files/neg/t6963.check
Diffstat (limited to 'test/files/neg/t6963b.flags')
| -rw-r--r-- | test/files/neg/t6963b.flags | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/neg/t6963b.flags b/test/files/neg/t6963b.flags new file mode 100644 index 0000000000..83caa2b147 --- /dev/null +++ b/test/files/neg/t6963b.flags @@ -0,0 +1 @@ +-Xmigration:2.7 -Xfatal-warnings
\ No newline at end of file |