Code

mergetool-lib: make the three-way diff the default for vim/gvim
authorDan McGee <dpmcgee@gmail.com>
Mon, 27 Sep 2010 15:19:09 +0000 (10:19 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:09:48 +0000 (13:09 -0700)
commit000866909a5d9233c89d8fcc33a8125cc84f24d6
tree9e029cca6012e74ca30d8a0b0d5f1c8a2a9cc011
parent829ef383a2b03a614d7d23e575270f2b10a805c1
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>
git-mergetool--lib.sh