[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

"Error: Invalid 'conflict_result' argument"

From: Pavel Lyalyakin <pavel.lyalyakin_at_visualsvn.com>
Date: Thu, 20 Jun 2013 17:06:10 +0400

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
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3058610
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-20 18:39:16 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.