DiffPlug

With DiffPlug you can view and edit a file with all the bells and whistles you'd expect from a cutting-edge editor. You can also compare one version of a file against another, and merge them back together to get the best from both. DiffPlug takes finding and opening files as seriously as it takes editing text. The unique browse bar automatically searches for files and folders as you type, whether they're on your local disk or a remote filesystem such as S3. The last 100 files that you opened are saved in the searchable history list. DiffPlug's image viewer makes it easy to surf around both. Drag to pan, mousewheel to zoom