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

Re: TortoiseDiff vs TortoiseMerge

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-09-21 22:09:12 CEST

Mathias Källberg wrote:
> I just installed 1.4.0.7501, and noticed what I think is an error under
> Settings -> External Programs -> Diff Viewer. There is a selection named
> "TortoiseMerge" where it should say "TortoiseDiff", right?

No, the text is correct. TortoiseMerge is the program used for both diff
and merge operations on text files. TortoiseIDiff (note the I in the
middle) is a separate program used to diff graphic images.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Sep 21 22:08:35 2006

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