diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:43 -0700 |
| commit | 3a9dae783bb66c18409d42d07949456dde8c4c62 (patch) | |
| tree | 740007ca3c8d057559a5bc112142e55a5fcacb50 /git.c | |
| parent | Merge branch 'fc/merge-default-to-upstream' (diff) | |
| parent | mergetools: add vimdiff3 mode (diff) | |
| download | git-3a9dae783bb66c18409d42d07949456dde8c4c62.tar.gz git-3a9dae783bb66c18409d42d07949456dde8c4c62.zip | |
Merge branch 'fc/mergetools-vimdiff3'
* fc/mergetools-vimdiff3:
mergetools: add vimdiff3 mode
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions