Tip #818: Vim/GVim as Diff tool for TortoiseCVS

tip karma

Rating 16/7, Viewed by 895

created:		November 9, 2004 13:01		complexity:		basic
author:		Alejandro Calbazana		as of Vim:		5.7

Under Win you can use TortoiseCVS along w/ Vim/GVim as the diff tool of choice: 1. Create a .bat file containing the following and put it in your path: @echo off "C:\Program Files\Vim\vim63\GVim.exe" -d %1 %2 2. Add this .bat file as the diff utility under TortoiseCVS->Preferences->Tools->External Diff Application. Alejandro

<<Non-blinking block cursor in the linux console | Quick (Re-)starting and Iconizing gvim with keystrokes for Windows >>

Additional Notes

jinwoo68 at gmail.com, November 9, 2004 17:15

You don't have to create a .bat file to do this. 1. Just enter "C:\Program Files\Vim63\GVim.exe" as "Diff application". 2. Set "Two-way diff parameters" as -d "%1" "%2".

acalbaza at calbazana.com, November 10, 2004 3:06

Hmm... Didnt work for me... The only way I got this to work was through a .bat file. Could just be my setup. Either way.. Its good to have this as the diff tool. Any ideas on how to merge the diffs? Alejandro

jsivak at winterjewel.com, November 10, 2004 5:04

Not that vim isn't good at diff'ing, but I use ExamDiff Pro (http://www.prestosoft.com) for Diff-ing with TortoiseCVS.. Not free, but the display/ease of merging is great.

jinwoo68 at gmail.com, November 10, 2004 21:18

I use WinMerge (http://www.winmerge.org). It's great. Today, the version 2.2 was announced.

LorenzTh at gmx.de, November 11, 2004 3:45

I'm using Meta-Diff (see http://meta-diff.sourceforge.net/). It's configured to use Vim for source files, Examdiff for other text files, CSDiff for Word documents etc. :)




	If you have questions or remarks about this site, visit the vimonline development pages. Please use this site responsibly. Questions about Vim should go to [email protected] after searching the archive. Help Bram help Uganda.