Dan McGee 000866909a 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>

2010-09-29 13:09:48 -07:00

9.0 KiB

Raw Blame History

View Raw