Re: [TSVN] Quick conflict resolving

Alexander Klenin wrote:

> However, I have recently installed TortoiseSVN 1.2.4, Build 4479, and
> the problem is still there -- namely, progress dialog shown after
> 'Switch' operation does have context menu with 'Resolve using "mine"'
> and 'Resolve using "theirs"' items, while similar dialog shown after
> 'Merge' operation does not.
>
> Steps to reproduce:
> 1) Check out a WC.
> 2) Make some modifications.
> 3) Merge with other branch so as to produce a conflict.
> 4) Try right-clicking on 'Conflict' messages in progress dialog.

Fixed in revision 4586.

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