Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge: Add diff3 style merge conflict formatter. | Haamed Gheibi | 2023-07-31 | 1 | -3/+11 |
* | Update EDL 1.0 license headers to new short SPDX compliant format | Matthias Sohn | 2020-01-04 | 1 | -38/+5 |
* | Fix javadoc in org.eclipse.jgit merge package | Matthias Sohn | 2017-12-19 | 1 | -7/+18 |
* | Fix Javadoc warnings | Robin Stocker | 2010-07-27 | 1 | -3/+2 |
* | Remove unnecessary semicolon in MergeChunk | Shawn O. Pearce | 2010-01-06 | 1 | -1/+2 |
* | Add file content merge algorithm | Christian Halstrick | 2010-01-06 | 1 | -0/+142 |