| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | mergetools: add description to all diff/merge tools | Fernando Ramos | 2022-04-04 | 1 | -0/+8 |
| * | mergetool: allow auto-merge for meld to follow the vim-diff behavior | Lin Sun | 2020-09-17 | 1 | -16/+69 |
| * | mergetools/meld: improve compatibiilty with Meld on macOS X | David Aguilar | 2017-06-19 | 1 | -1/+1 |
| * | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 | 1 | -2/+1 |
| * | mergetools/meld: make usage of `--output` configurable and more robust | David Aguilar | 2014-10-16 | 1 | -2/+7 |
| * | mergetools/meld: Use --help output to detect --output support | Jonathan Nieder | 2012-02-10 | 1 | -1/+1 |
| * | mergetools/meld: Use '--output' when available | David Aguilar | 2011-08-19 | 1 | -1/+24 |
| * | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 | 1 | -0/+9 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |