| commit | 3a9dae783bb66c18409d42d07949456dde8c4c62 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:43 +0000 (3 12:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:43 +0000 (3 12:06 -0700) | ||
| tree | 740007ca3c8d057559a5bc112142e55a5fcacb50 | treesnapshot (tar.gz zip) |
| parent | b8ef69fe2e837d78250555807073b5405f7c9297 | commitdiff |
| parent | 7c147b77d34f072c40b912fafba499727921fa6e | commitdiff |
Merge branch 'fc/mergetools-vimdiff3'
* fc/mergetools-vimdiff3:
mergetools: add vimdiff3 mode
* fc/mergetools-vimdiff3:
mergetools: add vimdiff3 mode