aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java
Commit message (Expand)AuthorAgeFilesLines
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-0/+2
* Fix typo in DiffTools#compare javadocMatthias Sohn2022-06-131-1/+1
* Teach JGit to handle external diff/merge tools defined in .gitattributesAndre Bossert2022-06-021-7/+63
* Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-021-60/+168
* Add availability check of pre-defined toolsAndre Bossert2022-06-011-7/+31
* Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-301-23/+18
* Add command line support for "git mergetool"Andre Bossert2022-05-251-4/+3
* Add difftool compare feature (execute external tool)Andre Bossert2022-05-251-26/+83
* Add config reader for user-defined difftoolsAndre Bossert2021-12-081-2/+24
* Add command line support for "git difftool"Andre Bossert2021-11-251-0/+121