| Commit message (Expand) | Author | Age | Files | Lines |
* | Deprecate Constants.CHARACTER_ENCODING in favor of StandardCharsets.UTF_8 | David Pursehouse | 2019-06-19 | 1 | -1/+2 |
* | Make diff locations more consistent | KB Sriram | 2017-04-03 | 1 | -0/+39 |
* | Revert "Fix warnings about unchecked conversion of MergeResult" | Shawn Pearce | 2016-02-15 | 1 | -1/+1 |
* | Fix warnings about unchecked conversion of MergeResult | David Pursehouse | 2016-02-15 | 1 | -1/+1 |
* | Do not add a newline at the end if neither merged side had one | André de Oliveira | 2015-03-27 | 1 | -9/+51 |
* | Optimize MergeAlgorithm if ours or theirs is empty | Christian Halstrick | 2011-05-17 | 1 | -1/+19 |
* | Convert all JGit unit tests to JUnit 4 | Robin Rosenberg | 2010-12-31 | 1 | -3/+17 |
* | Change default diff algorithm to histogram and add tests | Christian Halstrick | 2010-11-26 | 1 | -0/+19 |
* | Make diff algorithm configurable | Christian Halstrick | 2010-11-26 | 1 | -1/+1 |
* | Fixed merge algorithm regarding adjacent modifications | Christian Halstrick | 2010-11-02 | 1 | -1/+13 |
* | Cleaned up MergeAlgorithmTest | Christian Halstrick | 2010-11-02 | 1 | -67/+47 |
* | Fix Severe Bug in Merge Algorithm | Christian Halstrick | 2010-10-28 | 1 | -0/+11 |
* | Refactor diff sequence API | Shawn O. Pearce | 2010-09-06 | 1 | -1/+2 |
* | Improve MergeAlgorithm to produce smaller conflicts | Christian Halstrick | 2010-08-31 | 1 | -2/+13 |
* | Add file content merge algorithm | Christian Halstrick | 2010-01-06 | 1 | -0/+187 |