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

RE: 1.8, tree-conflict resolve gui, show log options

From: Greg Creager <greg.creager_at_hp.com>
Date: Fri, 20 Sep 2013 10:38:00 -0700 (PDT)

yes that is what I would expect also. My from URL is not what is showing up though, it is the common ancestor of my two merge branches and was not showing the file delete/move from the conflict.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-20 19:38:05 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.