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 =
version 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
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
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 kn
