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/diffmerge: support DiffMerge as a git mergetool | Stefan Saasen | 2013-10-13 |