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

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

-- 
       ___
  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