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

RE: Re: Tortoise 1.8 not show difference when merge

From: Gergely Toth <gergelyk3_at_gmail.com>
Date: Tue, 29 Oct 2013 03:15:18 -0700 (PDT)

Hello Simon,

On the branch I made some changes in some files.
I would merge the branch with manual merge.

I would see what is the changes in the branch because if I don't know it caused some errors in my trunk.

My colleague took changes in the branch. If the Tortoise not show what is the difference between the branch and the trunk during the merge it caused errors.

My problem is when I would merge the branch into the trunk the Tortoise not showed what is the diff. I know the branch contains diffs but I can not check.

It is clear?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-29 11:15:26 CET

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.