Re: Resolve using theirs/mine broken in nightly build

Dave Lawrence wrote:
> Hi,
>
> If "resolve using theirs" or "resolve using mine" are selected on a
> conflicted file from the update dialog, nothing happens. If selected
> from the check for modifications dialog, I get an "Invalid
> 'conflic_result' argument".

Thanks for the report.
Fixed in revision 12173.

> On this point, why are resolve using theirs and resolve using mine not
> in the explorer context menu, but only hidden away in other dialog menus?

Because in the resolved dialog, there are the same context menu entries.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net