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

Re: [TSVN] Diff/Merge utility suggestion

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-08-13 17:54:34 CEST

Brad Rhoads wrote:

> This might be OK. We've used their Directory Toolkit for a long time. But I
> haven't worked with file merge yet.
>
> http://www.funduc.com/file_merge_express.htm

That's one of the many, many tools which can only do two-way diffs. But
TortoiseMerge can do three-way diffs. And it can apply patchfiles.
That's the reason I started TortoiseMerge: there just wasn't a tool
around which could apply patchfiles (apart from the patch command line
tool which I find _horrible_ to use).

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 18:59:23 2004

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.