Diff'npatch for Mac

From Bernard Desgraupes:

Diff'nPatch is a port to the Macintosh of the GNU 'diff', 'patch' and 'cmp' utilities. It lets you compare and find differences between two files or folders, collate two files, generate diffs in various formats (normal, context, unidiff, etc.), apply patches, compare files byte by byte. It can handle any type of line endings (mac, unix or windows): Macintosh files have 'cr' line endings, Unix files have 'lf' line endings and Windows files have 'crlf' line endings. By default Diff'nPatch is able to guess the type of the files to compare. You can also specify this type explicitly.

With Diff'nPatch, you can collate two text files: they are displayed in a special "collate window" in two adjacent frames and you can browse through the differences, apply a difference from one file to the other, save the files, etc. Use the two buttons with a curved arrow to apply a diff from the old to the new file or from the new to the old one. If you press the option key while clicking on one of these buttons, then all diffs will be applied (a dialog asks you to confirm). To go from one diff to the other, you can use the slider or the navigation keys of your keyboard. Note that the separator between the two adjacent panels is moveable: just grab it with the mouse cursor.

You can also apply a patch, that is to say apply a file previously generated by 'diff' to an old file to restitute the new one. This is done in the 'patch' window which lets you specify a certain number of options.

There is also a command which lets you compare files (text or binary) byte by byte.

Diff'nPatch is entirely scriptable with AppleScript. More than 30 options. Various parameters can be customized via preferences.