Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix javadoc in org.eclipse.jgit merge package | Matthias Sohn | 2017-12-19 | 1 | -5/+4 |
* | Enable and fix warnings about redundant specification of type arguments | David Pursehouse | 2017-02-20 | 1 | -2/+2 |
* | Optimize MergeAlgorithm if ours or theirs is empty | Christian Halstrick | 2011-05-17 | 1 | -0/+31 |
* | Change default diff algorithm to histogram and add tests | Christian Halstrick | 2010-11-26 | 1 | -4/+4 |
* | Make diff algorithm configurable | Christian Halstrick | 2010-11-26 | 1 | -8/+21 |
* | Fixed merge algorithm regarding adjacent modifications | Christian Halstrick | 2010-11-02 | 1 | -4/+4 |
* | Fix Severe Bug in Merge Algorithm | Christian Halstrick | 2010-10-28 | 1 | -8/+19 |
* | Define DiffAlgorithm as an abstract function | Shawn O. Pearce | 2010-09-10 | 1 | -2/+2 |
* | Refactor diff sequence API | Shawn O. Pearce | 2010-09-06 | 1 | -8/+12 |
* | Improve MergeAlgorithm to produce smaller conflicts | Christian Halstrick | 2010-08-31 | 1 | -4/+35 |
* | Add file content merge algorithm | Christian Halstrick | 2010-01-06 | 1 | -0/+230 |