summaryrefslogtreecommitdiff
path: root/mergetools/meld
Commit message (Expand)AuthorAgeFilesLines
* mergetools: add description to all diff/merge toolsFernando Ramos2022-04-031-0/+8
* mergetool: allow auto-merge for meld to follow the vim-diff behaviorLin Sun2020-09-161-16/+69
* mergetools/meld: improve compatibiilty with Meld on macOS Xda/mergetools-meld-output-opt-on-macosDavid Aguilar2017-06-181-1/+1
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+1
* mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-161-2/+7
* mergetools/meld: Use --help output to detect --output supportjn/ancient-meld-supportJonathan Nieder2012-02-101-1/+1
* mergetools/meld: Use '--output' when availableDavid Aguilar2011-08-191-1/+24
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+9