Commit message (Expand) | Author | Age | |
---|---|---|---|
* | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 |
* | mergetools: stop setting $status in merge_cmd() | David Aguilar | 2014-11-21 |
* | mergetools/kdiff3: do not use --auto when diffing | David Aguilar | 2013-05-09 |
* | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 |