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

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

From: Gunnar Dalsnes <hardon_at_online.no>
Date: Wed, 19 Jun 2013 17:02:08 +0200

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.

Gunnar.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3058526

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-19 17:02:13 CEST

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

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