Stop with the diff tool

The filemerge app is not intuitive. It's capable, but not intuitive.