Re: Diff and three way diff when updating

On Jul 29, 12:48 am, Mikko Rantanen <mikko.2.ranta..._at_tut.fi> wrote:
> On 28 heinä, 21:47, Mikko Rantanen <mikko.2.ranta..._at_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_at_tortoisesvn.tigris.org].
Received on 2009-07-29 10:48:20 CEST