farinspace
farinspace

Reputation: 8801

Is there a way to use NetBeans DIFF tool as an external diff editor for TortiseSVN, or other editor?

... or perhaps a way to launch NetBeans through a middle-man app and open up a BASE and LOCAL file in the DIFF editor ...

Upvotes: 3

Views: 2049

Answers (2)

Alistair Sutherland
Alistair Sutherland

Reputation: 1361

If it is the style of the netbeans diff tool that you like, have a look at the free Perforce Merge Tool.

P4Merge
(source: perforce.com)

In TortoiseSVN settings set the external diff viewer to:

C:\Program Files\Perforce\P4Merge.exe -dw %base %mine

Upvotes: 4

M4N
M4N

Reputation: 96606

You can configure the diff tool used by TortoiseSVN in the settings (External Programs -> Diff Viewer).

The TortoiseSVN help file explains the different parameters that can be passed to the external diff tool via the command line.

Upvotes: 0

Related Questions