diff options
| author | Dan McGee <dpmcgee@gmail.com> | 2010-09-27 19:19:09 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-30 00:09:48 +0400 |
| commit | 000866909a5d9233c89d8fcc33a8125cc84f24d6 (patch) | |
| tree | 9e029cca6012e74ca30d8a0b0d5f1c8a2a9cc011 /daemon.c | |
| parent | 829ef383a2b03a614d7d23e575270f2b10a805c1 (diff) | |
mergetool-lib: make the three-way diff the default for vim/gvim
The original vimdiff/gvimdiff configuration is now available by using
'vimdiff2' or 'gvimdiff2' as the preferred merge tool.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions