aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
Commit message (Expand)AuthorAgeFilesLines
* Add Union merge strategy supportNasser Grainawi2024-11-041-1/+12
* MergeAlgorithm: Fix diff3 conflict hunk computationAntonin Delpeuch2024-04-091-2/+11
* Merge: Add diff3 style merge conflict formatter.Haamed Gheibi2023-07-311-0/+12
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-4/+10
* Implement ours/theirs content conflict resolutionThomas Wolf2021-04-191-19/+87
* Merge branch 'stable-5.6'Matthias Sohn2020-02-221-1/+1
|\
| * Reorder modifiers to follow Java Language SpecificationDavid Pursehouse2020-02-191-1/+1
* | Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
|/
* MergeAlgorithm: Suppress Error Prone warning about reference equalityDavid Pursehouse2019-08-081-1/+6
* Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-191-5/+4
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-2/+2
* Optimize MergeAlgorithm if ours or theirs is emptyChristian Halstrick2011-05-171-0/+31
* Change default diff algorithm to histogram and add testsChristian Halstrick2010-11-261-4/+4
* Make diff algorithm configurableChristian Halstrick2010-11-261-8/+21
* Fixed merge algorithm regarding adjacent modificationsChristian Halstrick2010-11-021-4/+4
* Fix Severe Bug in Merge AlgorithmChristian Halstrick2010-10-281-8/+19
* Define DiffAlgorithm as an abstract functionShawn O. Pearce2010-09-101-2/+2
* Refactor diff sequence APIShawn O. Pearce2010-09-061-8/+12
* Improve MergeAlgorithm to produce smaller conflictsChristian Halstrick2010-08-311-4/+35
* Add file content merge algorithmChristian Halstrick2010-01-061-0/+230
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-09 06:39:44 +0000