YaDT - Yet another Diff Tool. It is another front-end for diff/diff3 utilities with merge possibility
