summaryrefslogtreecommitdiff
path: root/mergetools/meld
AgeCommit message (Expand)AuthorFilesLines
2020-09-16mergetool: allow auto-merge for meld to follow the vim-diff behaviorLibravatar Lin Sun1-16/+69
2017-06-18mergetools/meld: improve compatibiilty with Meld on macOS XLibravatar David Aguilar1-1/+1
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar1-2/+1
2014-10-16mergetools/meld: make usage of `--output` configurable and more robustLibravatar David Aguilar1-2/+7
2012-02-10mergetools/meld: Use --help output to detect --output supportLibravatar Jonathan Nieder1-1/+1
2011-08-19mergetools/meld: Use '--output' when availableLibravatar David Aguilar1-1/+24
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar1-0/+9