aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
Commit message (Expand)AuthorAgeFilesLines
* Make diff locations more consistentKB Sriram2017-04-031-0/+39
* Revert "Fix warnings about unchecked conversion of MergeResult"Shawn Pearce2016-02-151-1/+1
* Fix warnings about unchecked conversion of MergeResultDavid Pursehouse2016-02-151-1/+1
* Do not add a newline at the end if neither merged side had oneAndré de Oliveira2015-03-271-9/+51
* Optimize MergeAlgorithm if ours or theirs is emptyChristian Halstrick2011-05-171-1/+19
* Convert all JGit unit tests to JUnit 4Robin Rosenberg2010-12-311-3/+17
* Change default diff algorithm to histogram and add testsChristian Halstrick2010-11-261-0/+19
* Make diff algorithm configurableChristian Halstrick2010-11-261-1/+1
* Fixed merge algorithm regarding adjacent modificationsChristian Halstrick2010-11-021-1/+13
* Cleaned up MergeAlgorithmTestChristian Halstrick2010-11-021-67/+47
* Fix Severe Bug in Merge AlgorithmChristian Halstrick2010-10-281-0/+11
* Refactor diff sequence APIShawn O. Pearce2010-09-061-1/+2
* Improve MergeAlgorithm to produce smaller conflictsChristian Halstrick2010-08-311-2/+13
* Add file content merge algorithmChristian Halstrick2010-01-061-0/+187
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 00:32:06 +0000