Comment on DiffMerge

Really great app, it's free and for the price it's much better than other commercial diff/merge apps.