[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: Simon Large <slarge_at_slarge.plus.com>
Date: 2005-03-11 12:09:33 CET

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.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Mar 11 12:08:43 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.