Meld is external diff tool.
Hidden files with ctrlp, and comment nowrap.