diff options
| author |  Googler <noreply@google.com> | 2016-07-20 20:24:03 +0000 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2016-07-21 20:34:48 +0000 |
| commit | 8fa303b1ac0a4bffcc535d85c07c86b3c8657d32 (patch) | |
| tree | 8421f9ee61ffcadf739f76fac4387491ab918a76 /src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac | |
| parent | 9c4629dafc3aafc10f952824efd448700ad3363e (diff) | |
Minor backwards compatibility fixes:
* Account for the dataKey in MergeConflicts (whoops.)
* When finding a conflict, always take the last value -- this matches the current merger strategy.
--
MOS_MIGRATED_REVID=127980673
Diffstat (limited to 'src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac')
0 files changed, 0 insertions, 0 deletions