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 /Documentation/pretty-options.txt | |
| parent | 79296749161a422a103b6b13e4762600b94a87bc (diff) | |
| parent | 35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b (diff) | |
| download | git-34e859d372fd26a661b080ee8ae1523201d28808.tar.gz | |
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 'Documentation/pretty-options.txt')
0 files changed, 0 insertions, 0 deletions