[SLUG] Side-by-side diff [Was: rdiff?]

2005-03-13 Thread Jeff Waugh 
quote who=Michael Lake

 Lyle Chapman wrote:
 Does anyone know of a gui for rdiff or something similar. Any suggestions
 are appreciated
 
 I use TkDiff which is a Tck/Tk interface diff.  Its pretty good as it
 shows the files sid-by-side and the non-matching areas highlighted
 graphically.  http://sourceforge.net/projects/tkdiff/

So the side-by-side diff tools are wildly different to rdiff. But while
we're on the topic, here's meld, which is a *very* sexy take on the genre:

  http://meld.sourceforge.net/

- Jeff

-- 
GUADEC 2005: May 29th-31st   http://2005.guadec.org/
 
I can't imagine anyone telling Emma Bunton to shut up. It would be
rather like slapping Bambi.
-- 
SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/
Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html

Re: [SLUG] Side-by-side diff [Was: rdiff?]

2005-03-13 Thread Erik de Castro Lopo 
On Mon, 14 Mar 2005 14:14:02 +1100
Jeff Waugh [EMAIL PROTECTED] wrote:

 So the side-by-side diff tools are wildly different to rdiff. But while
 we're on the topic, here's meld, which is a *very* sexy take on the genre:
 
   http://meld.sourceforge.net/

Yep, but even after all this time, its still not as good as
mgdiff, especially the Debian version which has half a dozen
of my patches.

   apt-get install mgdiff

The really nice thing about mgdiff is that by middle clicking you 
can choose both the left change and the right change which will 
write a CVS style bungled merge to the merged output file.

Erik
-- 
+---+
  Erik de Castro Lopo  [EMAIL PROTECTED] (Yes it's valid)
+---+
Java sucks. C sucks slightly less so, but only because it makes 
no pretense at all about being a high level language.
-- 
SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/
Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html