Mon, 8 Nov 2010 11:52:27 +, /Giulio Troccoli/:
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 b
On Monday 08 Nov 2010, Giulio Troccoli 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
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 =
>
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.trocc...@uk.linedata.com]
> Sent: 08 November 2010 11:52
> To: 'Subversion User List'
>
On Monday 08 November 2010 13:52:27 Giulio Troccoli 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 ha
