hg: amber/amber: Automatic merge with patterns

[maurizio.cimadamore at oracle.com]

Changeset: d2da9cce7a04
Author:    mcimadamore
Date:      2019-08-20 14:10 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/d2da9cce7a04

Automatic merge with patterns

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java