I second the vote for kdiff3, if you are looking for a GUI solution.

On 12/18/06, Tamas Rudnai <tamas.rudnai@gmail.com> wrote:
> kdiff3 is quite a good one
>
> http://kdiff3.sourceforge.net/
-- 
http://www.piclist.com PIC/SX FAQ & list archive
View/change your membership options at
http://mailman.mit.edu/mailman/listinfo/piclist