aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/UserDefinedMergeTool.java
Commit message (Expand)AuthorAgeFilesLines
* [errorprone] Add missing javadoc summaryMatthias Sohn2023-09-251-0/+4
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-1/+1
* Add command line support for "git mergetool"Andre Bossert2022-05-251-7/+17
* Add config reader for user-defined mergetoolsAndre Bossert2022-05-251-0/+59