let's see how Windows Jenkins likes it: https://scala-ci.typesafe.com/view/scala-2.11.x/job/scala-2.11.x-integrate-windows/1036/

our Jenkins infra doesn't do 2.11.x PR validation anymore, but I tested this locally on MacOS with test/partest test/files/run/t9880-9881.scala

# starting 1 test in run
ok 1 - run/t9880-9881.scala                    

ah, but actually the test fails locally without the whitespace change, so this was never a Windows-specific problem!

/nothingtoseehere

This change is [nomerge-to-2.12.x], is that right?

hmm, depends on whether "nomerge" means "not necessary to merge" or "potentially tricky and/or harmful to merge", I guess. this will merge forward automatically and harmlessly, I think, since 2.12.x already has the change, so I figured it wasn't necessary to mark it nomerge, but maybe I'm not clear on the policy (or maybe there is no clear policy on this).

ah, right it doesn't matter if it merges cleanly. i think [nomerge] should be there for changes that "should not" be merged. for changes that "can but don't need to", either way is fine.