Bill Rugolsky Jr. wrote:
It's also nice to have an interactive diff/merge tool. Emacs has a mode, or you can look at tkdiff,
http://sourceforge.net/projects/tkdiff/
or xxdiff,
http://sourceforge.net/projects/xxdiff/
Meld falls into this caregory too:
http://meld.sourceforge.net/
Also does directory and CVS diffs.
Carwyn