Wikia

Vim Tips Wiki

Changes: Use gvim for diff under TortoiseCVS

Edit

Back to page

(Move categories to tip template)
(Remove html character entities)
 
Line 13: Line 13:
 
The diff mode of Vim and Gvim is really excellent, and I like to use it as the external diff application with TortoiseCVS. Here's how you would configure this:
 
The diff mode of Vim and Gvim is really excellent, and I like to use it as the external diff application with TortoiseCVS. Here's how you would configure this:
   
1. Right-click any file and choose "CVS -> Preferences".
+
1. Right-click any file and choose "CVS -> Preferences".
   
 
2. In the TortoiseCVS window, choose the "Tools" tab.
 
2. In the TortoiseCVS window, choose the "Tools" tab.
Line 32: Line 32:
   
 
==Comments==
 
==Comments==
 
----
 

Latest revision as of 00:10, September 30, 2008

Tip 1286 Printable Monobook Previous Next

created July 17, 2006 · complexity basic · author Tom Purl · version 6.0


The diff mode of Vim and Gvim is really excellent, and I like to use it as the external diff application with TortoiseCVS. Here's how you would configure this:

1. Right-click any file and choose "CVS -> Preferences".

2. In the TortoiseCVS window, choose the "Tools" tab.

3. Place the following in the "Diff Application" text box (adjust for your Vim install location):

C:\Program Files\Vim\vim70\gvim.exe

4. Place the following in the "Two-way diff parameters" text box:

-d "%1" "%2"

Now you should be able to right-click a CVS-controlled file, choose the "CVS diff" option and view results in Gvim.

Any additional Gvim parameters should only appear in the "Two-way diff parameters" text box, not the "Diff application" text box.

CommentsEdit

Around Wikia's network

Random Wiki