Thank-you for your explanation, but given the additional information, I'm
still unable to get Araxis Merge to start.
Here is what I did to attempt to force the issue:
A- Modified my Merge parameters to specify the third (base) and merged file
parameters.
B- Re-started Eclipse (just to be certain).
C- Did a Team->Synchronize to see what my incoming changes were.
D- Modified a file that I knew was incoming thus creating a merge conflict.
E- Closed the Synchronization and did another one (just trying to avoid
boundary cases).
F- Double-clicked on the file that now has a merge conflict.
Again, no joy. The only thing that happens is the built-in compare tool
appears. Checked the console and find no errors.
Other things I tried:
1- Switched to conflict mode in Synchronize - no difference
2- From Navigator, right-click on file and choose Compare With
I appreciate your help,
Marc
-----Original Message-----
From: Mark Phippard [mailto:markp@softlanding.com]
Sent: Tuesday, August 08, 2006 9:42 AM
To: users@subclipse.tigris.org
Subject: Re: [Subclipse-users] External Diff/Merge doesn't seem to work
"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
merge),
> 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.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.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 16:20:56 2006