[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[Subclipse-users] External Diff/Merge doesn't seem to work

From: Marc Batchelor <mbatchelor_at_pentaho.org>
Date: 2006-08-08 15:39:26 CEST

Hey all,
I've configured my SVN Diff/Merge to use external diff tool (araxis merge),
but no matter what I do, only the built-in merge comes up.
Here's the dialog description:
Merge program: External D:\ntutil\AraxisMerge65\Compare.exe
Parameters: "${yours}" "${theirs}"
I've checked the console to see if any errors show up, but none do.
Subclipse version: 1.0.3
OS: Windows XP Professional
Eclipse: 3.1.2 build M20060118-1600

Marc Batchelor
Senior Architect and Engineer
Pentaho - Open Source Business Intelligence Tel. +1 407-812-OPEN |
http://www.pentaho.org <http://www.pentaho.org/>

To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Aug 8 15:40:39 2006

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.