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

Re: bug in TortoiseMerge 1.7.12 build 24070

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Mon, 6 May 2013 14:58:51 -0500

You didn't give a description of your problem, so I'm guessing you're
confused how to use the changes on the right side.

I think, if you just do nothing, you automatically keep the changes on the
righthand side.

I think you would have a better time if you get a 3-way diff tool
configured like kDiff3 or Meld or similar tools.

>

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-05-06 21:59:15 CEST

This message: [ Message body ]
Next message: Ben Fritz: "Re: TortoiseSVN 1.7.12 show changes bug"
Previous message: Eddie Fast: "RE: Re: TortoiseProc /command:cleanup going to Recycle Bin"
In reply to: yoker wu: "bug in TortoiseMerge 1.7.12 build 24070"
Next in thread: BladeOfLight16: "Re: bug in TortoiseMerge 1.7.12 build 24070"
Reply: BladeOfLight16: "Re: bug in TortoiseMerge 1.7.12 build 24070"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

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.