Wikia

Vim Tips Wiki

Changes: Integrate Vim diff with TortoiseCVS

Edit

Back to page

(Remove html character entities)
(Change <tt> to <code>, perhaps also minor tweak.)
 
Line 5: Line 5:
 
|previous=817
 
|previous=817
 
|next=819
 
|next=819
|created=November 9, 2004
+
|created=2004
 
|complexity=basic
 
|complexity=basic
 
|author=Alejandro Calbazana
 
|author=Alejandro Calbazana
Line 27: Line 27:
 
You don't have to create a .bat file to do this. Just enter "C:\Program Files\Vim63\GVim.exe" as "Diff application".
 
You don't have to create a .bat file to do this. Just enter "C:\Program Files\Vim63\GVim.exe" as "Diff application".
   
Set "Two-way diff parameters" as <tt>-d "%1" "%2"</tt>.
+
Set "Two-way diff parameters" as <code>-d "%1" "%2"</code>.
   
 
----
 
----

Latest revision as of 05:50, July 13, 2012

Duplicate tip

This tip is very similar to the following:

These tips need to be merged – see the merge guidelines.

Tip 818 Printable Monobook Previous Next

created 2004 · complexity basic · author Alejandro Calbazana · version 5.7


Under Windows, you can use TortoiseCVS along with Vim/GVim as the diff tool of choice:

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

Add this .bat file as the diff utility under TortoiseCVS->Preferences->Tools->External Diff Application.

CommentsEdit

You don't have to create a .bat file to do this. Just enter "C:\Program Files\Vim63\GVim.exe" as "Diff application".

Set "Two-way diff parameters" as -d "%1" "%2".


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.


I use WinMerge (http://www.winmerge.org). It's great.


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.


Around Wikia's network

Random Wiki