[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 15:23:08 CEST

Nick Gilbert wrote:

>> Read the tooltip on the editbox in the settings dialog?
>
>
> The tooltip is incomplete... It should also show %merged and %theirs.
>

There are two ediboxes. One for the external diff tool which doesn't
know about %merged and %theirs, and then theres an edit box for the
external merge tool.

They both have different tooltips.

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 16:26:49 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.