aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeToolConfig.java
Commit message (Expand)AuthorAgeFilesLines
* [errorprone] Add missing javadoc summaryMatthias Sohn2023-09-251-0/+16
* Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-021-1/+1
* Add command line support for "git mergetool"Andre Bossert2022-05-251-26/+32
* Add config reader for user-defined mergetoolsAndre Bossert2022-05-251-0/+141