[basiliothecat]

If you're on vim side - vimdiff does comparison just right. Though one'd need to tweak it to support comparing stuff from clipboard.