DiffFork v1.1.9.1 Mac OS X

Major Text Diff features include:

Block Guide and Scrolling in Sync. DiffFork supports Scrolling in Sync and Block Guide to help you identify the differences in the counterpart text files. Block Guide is the linking lines between the blocks.

Differences with Background Colors. Differences are marked with background colors according to their “Types”: red for removed, yellow for modified and green for added. Differences have “Levels” to help you understand them more easily and nested differences are marked with darker background colors.

Visual Feedback. A thin blue border will be displayed around the text of the selected difference block. For the “insertion”, a “Ribbon” (red or green, depending on the context) will be displayed to the left side of the text, in the place where the insertion is supposed to occur (or occurred).

Edit in Place. You can “input wherever you have output”. Differences will be updated according to your changes.

Encoding Detection. When you drag and drop text files on to the Diff window, DiffFork attempts to determine the encoding of the files, so they can be read and displayed correctly.

Major Folder Diff features include:

“Shadow diff” and ”Binary diff”. The folder diff involves two steps: the first “Shadow diff” and the second “Binary diff”. In the first step “shadow diff”, DiffFork scans folders and do a fast inaccurate compare to find out the initial different items (files and folders). And then, in the second step “binary diff”, items marked as SAME in the previous step are compared again byte for byte for accurate results.

Instant results display. When DiffFork scans folders and does the diffing, the results will be displayed as soon as possible. You don't have to wait until the whole process is completed.

Exclude rules. DiffFork uses a config file to control its behavior when it scans for files that it is to exclude. Excluded files will not be diffed and displayed.

The config file consists of a list of patterns, with one pattern a line. The # character is treated as a comment character. Two types of pattern syntax can be used: glob and regular expression.

Homepage: http://www.dotfork.com/difffork/