http://meld.sourceforge.net/index.html I know suggesting using a diff tool other than xxdiff borders on blasphemy, but this one looks pretty cool