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

RE: Use of kdiff3

From: Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com>
Date: Mon, 8 Nov 2010 11:55:13 +0000


Linedata Limited
Registered Office: 85 Gracechurch St., London, EC3V 0AA
Registered in England and Wales No 3475006 VAT Reg No 710 3140 03

-----Original Message-----

> From: Giulio Troccoli [mailto:Giulio.Troccoli_at_uk.linedata.com]
> Sent: 08 November 2010 11:52
> To: 'Subversion User List'
> Subject: Use of kdiff3
> Lots of people here use either TortoiseMerge or WinMerge for
> conflict resolution. But now I have a requirement to provide
> something similar for a Linux platform and I thought of kdiff3.
> I there anyone else that uses as well? I have install it but
> I would like some advice on how to call it. I know it can
> take two or three files, but I'm not sure why (i.e. what's
> the difference) and which files to "feed" it with and in what order.
> Thanks
> Giulio

Sorry, I'm RTFM now
Received on 2010-11-08 12:55:53 CET

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

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