aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java
Commit message (Expand)AuthorAgeFilesLines
* [errorprone] Fix BadImportMatthias Sohn2023-09-251-6/+8
* Fix DefaultCharset bug pattern flagged by error proneDavid Ostrovsky2022-06-171-3/+11
* Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-021-73/+64
* Add availability check of pre-defined toolsAndre Bossert2022-06-011-11/+35
* Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-301-19/+66
* Add mergetool merge feature (execute external tool)Andre Bossert2022-05-251-61/+262
* Add command line support for "git mergetool"Andre Bossert2022-05-251-0/+212