I use the svndiffwrapper[1] script to use SVN cli in combination with kdiff3. Save the script to ~/bin/ and make it executable. (And make sure ~/bin is on the path) Then change ~/.subversion/config to include the lines:
# diff3-has-program-arg = [true | false] diff-cmd = svndiffwrapper diff3-cmd = svndiffwrapper Then it will use the script to execute kdiff3. [1] http://www.yolinux.com/TUTORIALS/src/svndiffwrapper.txt Hth, Nick Stolwijk ~Java Developer~ IPROFS BV. Claus Sluterweg 125 2012 WS Haarlem http://www.iprofs.nl On Mon, Nov 8, 2010 at 12:52 PM, Giulio Troccoli <giulio.trocc...@uk.linedata.com> wrote: > 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 > > > > Linedata Limited > Registered Office: 85 Gracechurch St., London, EC3V 0AA > Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 > > > > >
