aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java
Commit message (Expand)AuthorAgeFilesLines
* [errorprone] Add missing javadoc summaryMatthias Sohn2023-09-251-0/+4
* [errorprone] Fix BadImportMatthias Sohn2023-09-251-3/+2
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-0/+3
* Teach JGit to handle external diff/merge tools defined in .gitattributesAndre Bossert2022-06-021-1/+53
* Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-021-59/+175
* Add availability check of pre-defined toolsAndre Bossert2022-06-011-8/+33
* Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-301-56/+38
* Add mergetool merge feature (execute external tool)Andre Bossert2022-05-251-20/+101
* Add command line support for "git mergetool"Andre Bossert2022-05-251-13/+90
* Add config reader for user-defined mergetoolsAndre Bossert2022-05-251-0/+119