Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add Union merge strategy support | Nasser Grainawi | 2024-11-04 | 1 | -0/+45 |
* | [errorprone] Fix pattern CatchAndPrintStackTrace | Matthias Sohn | 2024-04-29 | 1 | -12/+13 |
* | ResolveMerger: Fix the issue with binary modify-modify conflicts | Sruteesh | 2024-04-25 | 1 | -8/+1 |
* | Update EDL 1.0 license headers to new short SPDX compliant format | Matthias Sohn | 2020-01-04 | 1 | -38/+5 |
* | MergeGitAttributeTest: Open FileInputStream in try-with-resource | David Pursehouse | 2018-02-26 | 1 | -27/+17 |
* | Cleanup: Organize imports | Matthias Sohn | 2017-08-30 | 1 | -1/+1 |
* | Support -merge attribute in binary macro | Mathieu Cartaud | 2017-06-27 | 1 | -0/+585 |