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-10-13 | mergetools/diffmerge: support DiffMerge as a git mergetool | Stefan Saasen | 1 | -0/+15 |