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

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

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-08-08 15:42:29 CEST

"Marc Batchelor" <mbatchelor@pentaho.org> wrote on 08/08/2006 09:39:26 AM:

> I've configured my SVN Diff/Merge to use external diff tool (araxis
> but no matter what I do, only the built-in merge comes up.
> Here's the dialog description:
> Diff/Merge
> 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.

Perhaps it is not clear from the way that preference is defined, but that
option only applies to the Edit Conflicts action, which only occurs when
Subversion has produced a merge conflict in your working copy. This lets
you define the editor to resolve those conflicts. There are no options to
override the built-in compare/merge editors which are used during things
like Syncrhonize.


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:42:40 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.