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

Re: resolve conflict dialog is confusing

From: spongman <piersh_at_gmail.com>
Date: Wed, 19 Oct 2011 10:07:34 -0700 (PDT)

On Oct 17, 12:52 pm, Bob Archer <Bob.Arc..._at_amsi.com> wrote:
> My 3 way merge tool shows the path to the local copy, the repository copy and the merged result.

unfortunately, that doesn't help if
- you're using a different merge tool that doesn't use the same
terminology
- you're merging binary files

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-19 19:07:41 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.