aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java
Commit message (Expand)AuthorAgeFilesLines
* Run tests that checks araxis output only on LinuxSimeon Andreev2022-06-171-0/+2
* Teach JGit to handle external diff/merge tools defined in .gitattributesAndre Bossert2022-06-021-1/+2
* Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-021-13/+101
* Add availability check of pre-defined toolsAndre Bossert2022-06-011-5/+25
* Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-301-33/+22
* Add mergetool merge feature (execute external tool)Andre Bossert2022-05-251-7/+81
* Add command line support for "git mergetool"Andre Bossert2022-05-251-91/+15
* Add difftool compare feature (execute external tool)Andre Bossert2022-05-251-10/+53
* Add config reader for user-defined difftoolsAndre Bossert2021-12-081-4/+14
* Add command line support for "git difftool"Andre Bossert2021-11-251-0/+195