hg: amber/amber: manual merge with patterns

[vicente.romero at oracle.com]

Changeset: 59bd83783308
Author:    vromero
Date:      2018-10-07 10:19 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/59bd83783308

manual merge with patterns

! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java