Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Teach JGit to handle external diff/merge tools defined in .gitattributes | Andre Bossert | 2022-06-02 | 2 | -3/+189 |
* | Adapt diff- and merge tool code for PGM and EGit usage | Andre Bossert | 2022-06-02 | 3 | -80/+289 |
* | Add availability check of pre-defined tools | Andre Bossert | 2022-06-01 | 2 | -24/+6 |
* | Add filtering with help of DirCacheCheckout.getContent() | Andre Bossert | 2022-05-30 | 3 | -20/+21 |
* | Add command line support for "git mergetool" | Andre Bossert | 2022-05-25 | 1 | -26/+191 |
* | Add config reader for user-defined mergetools | Andre Bossert | 2022-05-25 | 1 | -0/+109 |
* | Add difftool compare feature (execute external tool) | Andre Bossert | 2022-05-25 | 2 | -16/+146 |
* | ExternalToolTest: Rename class name to usual name for test cases | David Ostrovsky | 2022-01-20 | 2 | -2/+2 |
* | Add config reader for user-defined difftools | Andre Bossert | 2021-12-08 | 1 | -12/+56 |
* | Add command line support for "git difftool" | Andre Bossert | 2021-11-25 | 2 | -0/+188 |