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

Re: [TSVN] Re: TortoiseMerge bug & feature request

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-09-03 22:52:03 CEST

Simon Large wrote:

>>>When I try to resolve a conflicted update using TME, the panes show
>>>'Theirs - tsvn_ch04.xml.r1638"
>>>"Yours - /mergedname:"
>>>"Merged - tsvn_ch04.xml"
>>>
>>>I think the Yours pane has an error in the title ;-)

Just an idea:
check your settings for the external merge tool in the settings dialog.
Maybe there's something wrong there? If you're not sure, just empty the
edit box, the default is always TortoiseMerge.

> Well the colours do change in the 'merged' window - the red disappears after
> resolving. But if there is a Prev/Next Conflict button I can find out if I
> missed anything... when you have spare time ;-)

I'll have a look at that. Soon.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 11 20:13:21 2004

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