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

RE: TortoiseMerge

From: Doucette, Charles <cdoucette_at_vaultus.com>
Date: 2007-10-05 15:50:45 CEST

Yes, sorry, I am asking to see it in the 3 pane (merge) view also - not just the 2-pane (diff) view.
I use a different diff tool - so I have never used tortoise merge as a diff tool.
So, I haven't seen it yet.

Chuck

________________________________________
From: Simon Large [simon.tortoisesvn@googlemail.com]
Sent: Friday, October 05, 2007 9:46 AM
To: users@tortoisesvn.tigris.org
Subject: Re: TortoiseMerge

On 05/10/2007, Doucette, Charles <cdoucette@vaultus.com> wrote:
> Then I guess I'm asking to see it in a 2-pane view.

Do you mean you're asking to see it in 3-pane view? It is already
there in 2-pane view.

Simon

> ________________________________________
> From: Simon Large [simon.tortoisesvn@googlemail.com]
> Sent: Friday, October 05, 2007 9:29 AM
> To: users@tortoisesvn.tigris.org
> Subject: Re: TortoiseMerge
>
> On 05/10/2007, Doucette, Charles <cdoucette@vaultus.com> wrote:
> > Actually - it was enabled. I believe it is enabled by default (because I've never heard about it and I didn't do anything to enable it).
> > Although it sounds like what I am looking for, I'm not sure what or where it is (i.e. I don't see it).
> > When I disable it, I see no difference.
>
> The diff bar is only present in 2-pane view, not 3-pane, so if you
> diff a modified (not conflicted) file you will see it at the bottom of
> the page.

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Oct 5 15:52:53 2007

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.