Log - 94e8e404a7ceaa4cbc34c2406e5dff4b08a49e85 - jrn/git

980145f mergetools: add description to all diff/merge tools by Fernando Ramos · 3 years ago
47eb4c6 mergetools/kdiff3: make kdiff3 work on Windows too by Michael Schindler · 3 years, 9 months ago
7c10605 mergetool: honor mergetool.$tool.trustExitCode for built-in tools by David Aguilar · 8 years ago
1e86d5b mergetools: stop setting $status in merge_cmd() by David Aguilar · 10 years ago
e2161bc mergetools/kdiff3: do not use --auto when diffing by David Aguilar · 12 years ago
bc7a96a mergetool--lib: Refactor tools into separate files by David Aguilar · 14 years ago