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

Keep "Thier" file

From: AMP <ampeloso_at_gmail.com>
Date: Mon, 8 Dec 2008 05:20:24 -0800 (PST)

Hello,
I have 2 files that are in conflict.
I want to keep the "Thiers" file. I dont want to merge each line by
hand.
How do I do that?
Thanks
Mike

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-08 14:21:01 CET

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

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