xxdiff looks pretty good too.
"actively maintained and stable"
xxdiff.sourceforge.net
I just found these on freshmeat.net, searched with "diff merge"
Matt
--
SLUG - Sydney Linux User's Group - http://slug.org.au/
More Info: http://lists.slug.org.au/listinfo/slug
