JDK 9's source code is now modular

[Chris Hegarty]

On 19 Aug 2014, at 03:38, Mandy Chung <mandy.chung at oracle.com> wrote:

>> 
>> note: possible conflict - src/share/classes/java/lang/instrument/package.html was renamed multiple times to:
>> src/java.instrument/share/classes/java/lang/instrument/package.html
>> src/java.management/share/classes/java/lang/management/package.html
>> 12548 files updated, 0 files merged, 12465 files removed, 0 files unresolved
>> 
> 
> These two package.html are the same copy after the source restructuring.

This is my fault, but is benign.

The actual contents of these files is correct, but the history of management/package.html is not. I will file a bug on this, and have it fixed.

-Chris.