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

RE: [TSVN] Official request... Directory Diff

From: <Bill.Hughes_at_cgi-europe.com>
Date: 2005-03-11 12:32:45 CET

Simon Large wrote:
> Peter Mounce wrote:
>> Off-topic - what's a three-way diff?
> If you have a file modified by 2 different people, a useful
> way to look
> at the changes is to compare what each of them has done with regard to
> the original file which was common to both workers. So you
> have 3 files:
> Original unmodified, from repository (base)
> Local mods A (mine)
> Local mods B (theirs)
> This is what TMerge does when you get conflicts.
> Simon

Or more generally it will show you the differences between three files...

P.S. I have outlook configured to send plain text but it appears to be
converted to html by our exchange server. This is not under my control, I
would be sending plain text if I could.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
*** Confidentiality Notice *** Proprietary/Confidential
Information belonging to CGI Group Inc. and its affiliates
may be contained in this message. If you are not a recipient
indicated or intended in this message (or responsible for
delivery of this message to such person), or you think for
any reason that this message may have been addressed to you
in error, you may not use or copy or deliver this message
to anyone else.  In such case, you should destroy this
message and are asked to notify the sender by reply email.
Received on Fri Mar 11 12:42:21 2005

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

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