diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:36 -0700 |
| commit | 34e859d372fd26a661b080ee8ae1523201d28808 (patch) | |
| tree | 37daddea5a4a02d08ff4f1595ba8d3e5c8dfaa57 /merge.c | |
| parent | Merge branch 'es/format-patch-doc-hide-no-patch' (diff) | |
| parent | mergetools: add support for ExamDiff (diff) | |
| download | tgif-34e859d372fd26a661b080ee8ae1523201d28808.tar.xz | |
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
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions