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
Junio C Hamano committed
Apr 13, 2016 at 14:12 UTC
34e859d372fd26a661b080ee8ae1523201d28808
No changes.