| commit | 34e859d372fd26a661b080ee8ae1523201d28808 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 21:12:36 +0000 (13 14:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 21:12:36 +0000 (13 14:12 -0700) | ||
| tree | 37daddea5a4a02d08ff4f1595ba8d3e5c8dfaa57 | treesnapshot (tar.gz zip) |
| parent | 79296749161a422a103b6b13e4762600b94a87bc | commitdiff |
| parent | 35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b | commitdiff |
Merge branch 'jn/mergetools-examdiff'
"git mergetools" learned to drive ExamDiff.
* jn/mergetools-examdiff:
mergetools: add support for ExamDiff
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
"git mergetools" learned to drive ExamDiff.
* jn/mergetools-examdiff:
mergetools: add support for ExamDiff
mergetools: create mergetool_find_win32_cmd() helper function for winmerge