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