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.
Another one is kdiff3
http://kdiff3.sourceforge.net/
From the web page
KDiff3 is a program that
* compares or merges two or three text input files or directories,
* shows the differences line by line and character by character (!),
^^^^^^^^^^^^^^^^^^^^^^^^^^^
* provides an automatic merge-facility and
* an integrated editor for comfortable solving of merge-conflicts,
* supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
* ...
jpo -- José Pedro Oliveira * mailto: jpo@xxxxxxxxxxxx * http://gsd.di.uminho.pt/~jpo * * gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B *
Attachment:
signature.asc
Description: OpenPGP digital signature
