From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Apr 2016 21:12:36 +0000 (-0700)
Subject: Merge branch 'jn/mergetools-examdiff'
X-Git-Tag: v2.9.0-rc0~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34e859d372fd26a661b080ee8ae1523201d28808;p=thirdparty%2Fgit.git

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
---

34e859d372fd26a661b080ee8ae1523201d28808