[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tortoisesvn-users
Subject:    Re: Diff and three way diff when updating
From:       Mikko Rantanen <mikko.2.rantanen () tut ! fi>
Date:       2009-07-29 6:11:35
Message-ID: 4c12b514-fdda-499f-b395-e1e06647991a () w6g2000yqw ! googlegroups ! com
[Download RAW message or body]

On Jul 29, 12:48  am, Mikko Rantanen <mikko.2.ranta...@tut.fi> wrote:
> On 28 heinä, 21:47, Mikko Rantanen <mikko.2.ranta...@tut.fi> wrote:
>
> Nevermind this one! For some reason I missed the fact that this is
> already implemented.
>

.. And the reason is that when trying to view the merge by
doubleclicking, Tortoise shows a normal 2 way diff. The 3 way diff is
only shown when selecting Compare with Working Copy from the context
menu. This together with the misleading labels (Revision [base],
Working Copy instead of Revision [base], Revision [head]) in the two
way diff must have resulted in this confusion.

- Mikko Rantanen

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe@tortoisesvn.tigris.org].

[prev in list] [next in list] [prev in thread] [next in thread]