Re: [TSVN] TortoiseMerge

On Tue, 21 Dec 2004 15:15:24 -0600, Josha Foust <jfoust@mankowindows.com> wrote:
> Because the right pane is "Yours" and selecting that menu item (the first
> one) uses the text from that pane (Yours). The equivalent left pane context
> menu just says "Use this text block".
>
> Attached is a combined screen shot of the context menus I get in a
> conflicted merge.

Thanks for the screenshot. That helped - sorry, but sometimes I'm a
little slow...

Fixed in revision 2193.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org