hg: amber/amber/langtools: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

Changeset: d7362d876d80
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-18 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/d7362d876d80

Automatic merge with constant-folding

- test/jdk/jshell/MergedTabShiftTabCommandTest.java
- test/jdk/jshell/MergedTabShiftTabExpressionTest.java