Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 | 1 | -0/+4 |
* | mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-status | David Aguilar | 2014-11-21 | 1 | -1/+0 |
* | mergetools/diffmerge: support DiffMerge as a git mergetool | Stefan Saasen | 2013-10-13 | 1 | -0/+15 |