Re: [T-Merge] After use mark as resolved, dialog apears

On 17.05.2013 09:14, Oto BREZINA wrote:
> Using latest full nightly
>
> What I did: Open conflict file in TortoiseMerge using "Edit conflict"
> command. Resolve all conflict e.g. using use this whole file command.
> Use "mark as resolved".
>
> What I get: TortoiseMerge After use "mark as resolved" button from
> ribbon show dialog "File has no conflicts", "mark as resolved".
>
> What I expect: When pressing resolved, I want to mark as resolved
> without questions. (In case of unresolved conflict I expect dialog).

Thanks for the report.
Fixed in r24194.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3055788
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].