[plug] comparing files

[Trevor Phillips]

Jon Miller wrote:
> 
> I would like to know how to compare 2 files of the same name and take the difference and merge it into the newer file.
> I'm seen somewhere where it had to do with the diff command, but I'm not too sure about the merging of the differences.

I quite like "tkdiff", a variant on diff which gives a graphical side-by-side
view of two files, hilighting the differences. It allows you to selectively
merge differences and save the merged file, although I haven't used it to do
this myself.

-- 
. Trevor Phillips             -           http://jurai.murdoch.edu.au/ . 
: CWIS Systems Administrator     -           T.Phillips at murdoch.edu.au : 
| IT Services                       -               Murdoch University | 
 >------------------- Member of the #SAS# & #CFC# --------------------<
| On nights such as this, evil deeds are done. And good deeds, of     /
| course. But mostly evil, on the whole.                             /
 \      -- (Terry Pratchett, Wyrd Sisters)                          /