summaryrefslogtreecommitdiff
path: root/test/files/neg/macro-nontree.flags
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2012-04-26 15:35:57 -0700
committerSom Snytt <som.snytt@gmail.com>2012-04-26 15:35:57 -0700
commit2a9cce8a6859a34c259d0b399687df3a242de16b (patch)
treeca15e0b069265ff7ec43d147e613bb044f38c91a /test/files/neg/macro-nontree.flags
parent47bfd744177121de08fed489a5b0b1b59a1ae06a (diff)
parentf7e1a4940386491b0691147b12b1b321c4cce2c5 (diff)
downloadscala-2a9cce8a6859a34c259d0b399687df3a242de16b.tar.gz
scala-2a9cce8a6859a34c259d0b399687df3a242de16b.tar.bz2
scala-2a9cce8a6859a34c259d0b399687df3a242de16b.zip
SI-5543: Merge with trunk
Reverts name unenmanglement that was objectionable in the previous patch commit 47bfd744177121de08fed489a5b0b1b59a1ae06a.
Diffstat (limited to 'test/files/neg/macro-nontree.flags')
-rw-r--r--test/files/neg/macro-nontree.flags2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/macro-nontree.flags b/test/files/neg/macro-nontree.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/files/neg/macro-nontree.flags
+++ b/test/files/neg/macro-nontree.flags
@@ -1 +1 @@
--Xmacros \ No newline at end of file
+-language:experimental.macros \ No newline at end of file