recommend me a nice diff merge tool?

[nanotube]

Hi,

I am looking for a nice, easy, simple, (preferably gui-based, but not necessarily) tool that will allow me to easily merge two versions of plain text file. I am specifically looking at LaTeX here, but i presume that anything that works for real code will work just fine for latex as well.

I am looking for something probably along the lines of:

• show two versions side by side, with diffs
• let me review the diffs one by one
• allow me to choose "automerge" for simple cases, where i can just accept an addition/deletion/edit
• allow me to manually merge for the "difficult" cases

Any suggestions?

Thanks in advance for any help. :)

[nanotube]

ok, problem solved. thanks to the ubuntu IRC channel and user "fiery_cleric", i found that "meld" (available as package 'meld' in the universe repository) is a great diff merge tool, and fits the bill quite nicely. :)

[WW]

Hey, thanks for answering your own post. I was wondering what would show up here. Meld looks very cool!

[nanotube]

Hey, thanks for answering your own post. I was wondering what would show up here. Meld looks very cool!

glad i could help :)

[DC@DR]

Yeah, Meld is nice, it has pretty much everything required for a diff and merge tool, and it's Gnome-based, that makes it fit perfectly with my Dapper Drake

[xadder]

www.linux.com has an article on meld, and also some tips for those wanting KDE equivalents. I also just saw that even vim does something similar (gvimdiff option), although meld looks more user friendly at first sight. (I love vi/vim, but there are way too many options to learn them all!)

[Jonathan Métillon]

Hi,

Meld is very dependent on GNOME libs. Is there an equivalent application that's recommended to use in a lightweight environment, like Xfce, as in Xubuntu?

Meld has been removed from the recommended applications page at Xfce wiki. But there's no replacement.

Thanks!

[xadder]

See the article I mentioned above. I think most alternatives were for KDE, but the gvimdiff option will work on anything!

[Jonathan Métillon]

Thanks, I'll go for vimdiff (no gvim for me) !

[bicchi]

I actually didn't know about vimdiff. Thanks for the tip.
By the way, if you wish to move the cursor from one screen to the other for editing press:
<Ctrl> - w then either <Left Arrow> or <Right Arrow>
Make sure you have pressed <Escape> first.

How do I exit from all the windows without having to type :q! multiple times?

Found it:
To exit from all without saving any of my changes
:qa!