Re: TSVN 1.8 strange merge error: Invalid 'conflict_result' argument

On 19.06.2013 17:02, Gunnar Dalsnes wrote:
> Also, I do not get any
> Merged revision(s) X, from Y:
> Z
> ........
> message in Recent messages when I get this error.
>
> I did a merge without conflicts as well. Then I didn't get the strange
> error and the merge message was correctly generated, so the problem is
> only if conflicts.

created issue #483 for this:
http://code.google.com/p/tortoisesvn/issues/detail?id=483

Stefan

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