Age | Commit message (Expand) | Author |
---|---|---|
2016-11-29 | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar |
2014-11-21 | mergetools: stop setting $status in merge_cmd() | David Aguilar |
2013-10-14 | mergetools/diffmerge: support DiffMerge as a git mergetool | Stefan Saasen |