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 comfort
KDiff3 – Homepage
Delicious links