Changes: Use gvim for diff under TortoiseCVS

Latest revision as of 00:10, 30 September 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.

@@ Line 1: / Line 1: @@
+{{TipImported
-{{Tip
 |id=1286
+|previous=1285
-|title=Using Gvim As Your TortoiseCVS External Diff Application
+|next=1287
-|created=July 17, 2006 11:59
+|created=July 17, 2006
 |complexity=basic
 |author=Tom Purl
 |version=6.0
 |rating=8/9
+|category1=Integration
-|text=
+|category2=VersionControl
-The diff mode of Vim &amp; 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:
+. Right-click any file and choose "CVS -> Preferences".
-. Right-click on any file and choose "CVS -&gt; Preferences".
+. In the TortoiseCVS window, choose the "Tools" tab.
+. Place the following in the "Diff Application" text box (adjust for your Vim install location):
-. In the TortoiseCVS window, choose the "Tools" tab.
+<pre>
+C:\Program Files\Vim\vim70\gvim.exe
+</pre>
-. Place the following in the "Diff Application" text box (adjust for your vim install location):
+. Place the following in the "Two-way diff parameters" text box:
+<pre>
- C:\Program Files\Vim\vim70\gvim.exe
+-d "%1" "%2"
+</pre>
+Now you should be able to right-click a CVS-controlled file, choose the "CVS diff" option and view results in Gvim.
-. Now place the following in your "Two-way diff parameters text box:
- -d "%1" "%2"
+Any additional Gvim parameters should only appear in the "Two-way diff parameters" text box, not the "Diff application" text box.
-That's it! Now you should be able to right-click on a CVS-controlled file, choose the "CVS diff" option and view results in Gvim.
+==Comments==
-The reason that I'm sharing this seemingly-simple tip is that I spent a while trying to do this using the gvimdiff.bat file. This simply doesn't work. Also, any additional Gvim parameters should only appear in the "Two-way diff parameters" text box, not the "Diff application" text box.
-}}
-<!-- parsed by vimtips.py in 0.506097  seconds-->
-[[Category:VersionControl]]

Changes: Use gvim for diff under TortoiseCVS

Latest revision as of 00:10, 30 September 2008

Comments[]