diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 11:38:41 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 11:38:41 +1000 |
| commit | 288d4ef1509160b21134e3ddacca5ee8311919ba (patch) | |
| tree | b7b335b7f26bf6dbcda43d024c554eb06cbd97f1 /test/files/neg/choices.check | |
| parent | da46355a90442636ee7634c31a69eae8e8b9cd42 (diff) | |
| parent | 333187a7c020b7d51d68c5435852305e70d89d41 (diff) | |
| download | scala-288d4ef1509160b21134e3ddacca5ee8311919ba.tar.gz scala-288d4ef1509160b21134e3ddacca5ee8311919ba.tar.bz2 scala-288d4ef1509160b21134e3ddacca5ee8311919ba.zip | |
Merge remote-tracking branch 'origin/2.12.x' into merge/2.11.x-to-2.12.x-20160203
Diffstat (limited to 'test/files/neg/choices.check')
| -rw-r--r-- | test/files/neg/choices.check | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/files/neg/choices.check b/test/files/neg/choices.check index b114394e96..df4f23461f 100644 --- a/test/files/neg/choices.check +++ b/test/files/neg/choices.check @@ -1,2 +1,6 @@ +error: Usage: -Yresolve-term-conflict:<strategy> + where <strategy> choices are package, object, error (default: error) +error: bad option: '-Yresolve-term-conflict' error: bad options: -Yresolve-term-conflict -one error found +error: flags file may only contain compiler options, found: -Yresolve-term-conflict +four errors found |