Re: "Error: Invalid 'conflict_result' argument"

Hello,

False alarm. It looks like it's the solved issue #483:
http://code.google.com/p/tortoisesvn/issues/detail?id=483

On Thu, Jun 20, 2013 at 5:06 PM, Pavel Lyalyakin
<pavel.lyalyakin_at_visualsvn.com> wrote:
> Hello,
>
> I run automatic merge in TortoiseSVN 1.8.0-release and it encounters a
> conflict. It shows me the "Resolve Conflict" dialog. If I choose any option
> except "Edit conflict" then I get the error:
>
> [[
> Error: Invalid 'conflict_result' argument
> Completed!:
> ]]
>
> --
> With best regards,
> Pavel Lyalyakin
> VisualSVN Team

-- 
With best regards,
Pavel Lyalyakin
VisualSVN Team
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3058612
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].