| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'stable-7.1' | Matthias Sohn | 2024-12-06 | 1 | -0/+2 |
| |\ | |||||
| | * | Disable MergeToolTest#testEmptyToolName | Matthias Sohn | 2024-12-02 | 1 | -0/+2 |
| * | | MergeToolTest: update expected error from the tool | Ivan Frade | 2024-12-04 | 1 | -1/+1 |
| |/ | |||||
| * | Run tests that checks araxis output only on Linux | Simeon Andreev | 2022-06-17 | 1 | -0/+2 |
| * | Adapt diff- and merge tool code for PGM and EGit usage | Andre Bossert | 2022-06-02 | 1 | -6/+71 |
| * | Add availability check of pre-defined tools | Andre Bossert | 2022-06-01 | 1 | -5/+25 |
| * | Add mergetool merge feature (execute external tool) | Andre Bossert | 2022-05-25 | 1 | -34/+208 |
| * | Add command line support for "git mergetool" | Andre Bossert | 2022-05-25 | 1 | -0/+136 |
 |
index : jgit.git | |
| JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit | www-data |
| aboutsummaryrefslogtreecommitdiffstats |