Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge: Add diff3 style merge conflict formatter. | Haamed Gheibi | 2023-07-31 | 1 | -12/+60 |
* | Update EDL 1.0 license headers to new short SPDX compliant format | Matthias Sohn | 2020-01-04 | 1 | -38/+5 |
* | MergeFormatterPass: Remove constructor taking charset name as string | Jonathan Nieder | 2018-09-30 | 1 | -25/+0 |
* | MergeFormatter{Pass}: Use Charset instead of String | David Pursehouse | 2018-09-30 | 1 | -3/+43 |
* | Add missing newlines at ends of Java files | David Pursehouse | 2017-07-25 | 1 | -1/+1 |
* | Do not add a newline at the end if neither merged side had one | André de Oliveira | 2015-03-27 | 1 | -0/+146 |