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

RE: Re: TMerge does not show all conflicts?

From: Sven Strickroth <tigris_at_cs-ware.de>
Date: Sun, 18 Nov 2012 11:43:42 -0800 (PST)

I'm a bit confused now. In Changelog.txt a conflict is indicated, but not in TMerge (only if I use Changelog.txt as base).

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3029223

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-11-18 20:43:47 CET

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