merge tools

Björn Lindberg d95-bli at nada.kth.se
Mon Nov 1 02:45:03 PST 2004


Miguel Bazdresch <lfs-01 at thewizardstower.org> writes:

> Hi,
> 
> What are you guys using to merge code?
> 
> Yesterday I installed Meld (I had to install half of gnome along with
> it) and it's nice but too slow on my poor P3-800 (it's written in
> Python).
> 
> I'm compiling Qt as I write this to be able to try xxdiff and kdiff3. As
> far as I can tell these are the only three alternatives. What are your
> recommendations?

I use plain diff & patch. :-) But seriously, what do you want it for?
I have never used any of the tools you mention, but I know that Emacs
has a diff mode, although I haven't really used it much either.


Björn



More information about the lfs-chat mailing list