diff options
author | Paul Phillips <paulp@improving.org> | 2012-09-20 14:07:01 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-09-20 14:07:01 -0700 |
commit | cc6f5f97f8a4290391a69ac96f134cb3e8ed4381 (patch) | |
tree | f2aa4f428719b7a8c8afd9959161f43b26a2c06d /test/files/run/macro-expand-override.check | |
parent | c8e6f8e64c4d9967cee41486cc2e324da0262976 (diff) | |
parent | 08de8afde6c99fb1739eb9730e6fce4eef54f296 (diff) | |
download | scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.tar.gz scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.tar.bz2 scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.zip |
Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.x
Diffstat (limited to 'test/files/run/macro-expand-override.check')
-rw-r--r-- | test/files/run/macro-expand-override.check | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/files/run/macro-expand-override.check b/test/files/run/macro-expand-override.check index 486bec7098..b41dc156c4 100644 --- a/test/files/run/macro-expand-override.check +++ b/test/files/run/macro-expand-override.check @@ -1,15 +1,15 @@ -(fooBString,Expr[Nothing](Test.this.dd),42)
-(fooDInt,Expr[Nothing](Test.this.dd),42)
-fooBBoolean
-(fooBString,Expr[Nothing](Test.this.db),42)
-(fooBInt,Expr[Nothing](Test.this.db),42)
-fooBBoolean
-(fooZString,Expr[Nothing](Test.this.zz),42)
-(fooDInt,Expr[Nothing](Test.this.zz),42)
-fooZBoolean
-(fooBString,Expr[Nothing](Test.this.zd),42)
-(fooDInt,Expr[Nothing](Test.this.zd),42)
-fooZBoolean
-(fooBString,Expr[Nothing](Test.this.zb),42)
-(fooBInt,Expr[Nothing](Test.this.zb),42)
-fooZBoolean
+(fooBString,Expr[Nothing](Test.this.dd),42) +(fooDInt,Expr[Nothing](Test.this.dd),42) +fooBBoolean +(fooBString,Expr[Nothing](Test.this.db),42) +(fooBInt,Expr[Nothing](Test.this.db),42) +fooBBoolean +(fooZString,Expr[Nothing](Test.this.zz),42) +(fooDInt,Expr[Nothing](Test.this.zz),42) +fooZBoolean +(fooBString,Expr[Nothing](Test.this.zd),42) +(fooDInt,Expr[Nothing](Test.this.zd),42) +fooZBoolean +(fooBString,Expr[Nothing](Test.this.zb),42) +(fooBInt,Expr[Nothing](Test.this.zb),42) +fooZBoolean |