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

Re: Diff and three way diff when updating

From: Mikko Rantanen <mikko.2.rantanen_at_tut.fi>
Date: Tue, 28 Jul 2009 14:48:51 -0700 (PDT)

On 28 heinä, 21:47, Mikko Rantanen <mikko.2.ranta..._at_tut.fi> wrote:
> ... Similar to this, after
> merging a file during update, is it possible to change the default
> action to 3 way merge preview?

Nevermind this one! For some reason I missed the fact that this is
already implemented.

So the only valid point here is the action during normal update -
diffing that against the base revision instead of the working copy.

- Mikko Rantanen

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-29 10:48:10 CEST

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.