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

Re: [TSVN] external merge tools - how?

From: Stefan Küng <stefan.kueng_at_wagner-group.ch>
Date: 2004-07-09 14:53:45 CEST

Ivan-Assen Ivanov wrote:
> Hello,
>
> I'm trying to run an external merge tool from TortoiseSVN.
> I enter the path to Araxis's merge.exe or Perforce's p4winmrg.exe,
> and when I select "Edit Conflicts", Tortoise launches them, but
> apparently without parameters. What should I add on the command line
> for it to work?

Read the tooltip on the editbox in the settings dialog?

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jul 9 15:56:48 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

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