(Change to TipImported template + severe manual clean) |
(Change <tt> to <code>, perhaps also minor tweak.) |
||
| (2 intermediate revisions by the same user not shown) | |||
| Line 5: | Line 5: | ||
|previous=817 |
|previous=817 |
||
|next=819 |
|next=819 |
||
| − | |created= |
+ | |created=2004 |
|complexity=basic |
|complexity=basic |
||
|author=Alejandro Calbazana |
|author=Alejandro Calbazana |
||
|version=5.7 |
|version=5.7 |
||
|rating=20/8 |
|rating=20/8 |
||
| ⚫ | |||
| + | |category2= |
||
}} |
}} |
||
Under Windows, you can use TortoiseCVS along with Vim/GVim as the diff tool of choice: |
Under Windows, you can use TortoiseCVS along with Vim/GVim as the diff tool of choice: |
||
| Line 20: | Line 22: | ||
</pre> |
</pre> |
||
| − | Add this .bat file as the diff utility under TortoiseCVS- |
+ | Add this .bat file as the diff utility under TortoiseCVS->Preferences->Tools->External Diff Application. |
==Comments== |
==Comments== |
||
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 < |
+ | Set "Two-way diff parameters" as <code>-d "%1" "%2"</code>. |
---- |
---- |
||
| Line 37: | Line 39: | ||
---- |
---- |
||
| ⚫ | |||
Latest revision as of 05:50, 13 July 2012
Duplicate tip
This tip is very similar to the following:
These tips need to be merged – see the merge guidelines.
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.
Comments[]
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.