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

(Fwd) Re: Recommended merge tool

From: Jan Hendrik <list.jan.hendrik_at_gmail.com>
Date: Tue, 18 Nov 2008 11:36:21 +0100

Nick,

I suppose you got stuck with the setup of this list not providing the
list address for replies, so I forward your message to the list...

Jan Hendrik

------- Forwarded message follows -------
Date sent: Tue, 18 Nov 2008 11:23:11 +0100
From: "Nick Stolwijk" <nick.stolwijk_at_gmail.com>
To: "Jan Hendrik" <list.jan.hendrik_at_gmail.com>
Subject: Re: Recommended merge tool

I use KDiff3 with the svndiffwrapper script [1] to integrate the svn
and kdiff3 command. Is it the diff tool you don't like or the
integration with svn?

[1] http://www.yolinux.com/TUTORIALS/Subversion.html

Hth,

Nick Stolwijk
~Java Developer~

Iprofs BV.
Claus Sluterweg 125
2012 WS Haarlem
www.iprofs.nl

On Tue, Nov 18, 2008 at 11:02 AM, Jan Hendrik
<list.jan.hendrik_at_gmail.com> wrote:
> Concerning Re: Recommended merge tool
> Bogdan Cristea wrote on 18 Nov 2008, 10:45, at least in part:
>
>> I am using linux (openSuSE 10.3) with svn in command line mode. As
>> merge tool a graphical application is best suited I think. Now I am
>> using kdiff3, but I want to try other options.
>
> Sorry, but with Linux I have no ideas. Try
>
> http://www.google.com/search?rls=en&q=linux+winmerge&ie=utf-8&oe=utf-8
>
> At a glance at the first result page there seem to be attempts to
> port (or replicate) WinMerge to Linux. One seems to be called
> Meld.
>
> Jan Hendrik
> ---------------------------------------
> Freedom quote:
>
> If some among you fear taking a stand
> because you are afraid of reprisals
> from customers, clients, or even government,
> recognize that you are just feeding the crocodile
> hoping he'll eat you last.
> -- Ronald Reagan
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: users-help_at_subversion.tigris.org
>
>
------- End of forwarded message -------
---------------------------------------
Freedom quote:

     But we know that freedom cannot be served by the devices of the tyrant.
     As it is an ancient truth that freedom cannot be legislated into existence,
     so it is no less obvious that freedom cannot be censored into existence.
     And any who act as if freedom's defenses are to be found in suppression and
     suspicion and fear confess a doctrine that is alien to America.
               -- Dwight D. Eisenhower

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-18 11:33:07 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.