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