diff options
| author |  Googler <noreply@google.com> | 2016-05-04 19:53:41 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-05-05 19:10:02 +0000 |
| commit | 799a82509438572e43a9b62e19890156d721c12f (patch) | |
| tree | da1dce6eac8fc72bceb9277f698a9a14c15b8b9e /src/main/java/com/google/devtools/common/options/Option.java | |
| parent | 12f54455e945b16df70bf1981e4eabc1d3570f82 (diff) | |
4.95 of 5: Merger changes
* Merge conflicts are now bright red warnings, as the previous merger was simultaneously stricter and looser than expected.
* Legacy resource rules are now detected and cause bright red warnings.
* Merge conflicts will test for equality either of file contents or parsed xml
--
MOS_MIGRATED_REVID=121510152
Diffstat (limited to 'src/main/java/com/google/devtools/common/options/Option.java')
0 files changed, 0 insertions, 0 deletions