| commit | 6631354fb3825dd0355ef103dcd1a8ecbffd49d1 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Feb 23 15:04:32 2021 +0000 |
| committer | Anton Hansson <hansson@google.com> | Tue Feb 23 15:04:32 2021 +0000 |
| tree | b470a8f005d9559aa934b2cea0143a3ccc45e80e | |
| parent | f3aa76929d2f3d6ed64e8f822f02280232427428 [diff] |
Disallow use of error-prone merge-strategies Test: No Change-Id: I2ed682c013e9bf0bfe43270382fcb8f9cec24e10