3 Commits (5d2124b34a11967b56bfeb57556be5e4583172c8)

Author SHA1 Message Date
David Aguilar 7c10605d2c mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
David Aguilar 1e86d5b11d mergetools: stop setting $status in merge_cmd() 10 years ago
Stefan Saasen c5f424fd01 mergetools/diffmerge: support DiffMerge as a git mergetool 12 years ago