Release notes

The first version of Converge, a native Mac app that compares and merges files.

Compare

• Compare two text files side by side, with synchronized scrolling. Converge colours the added, removed and modified lines, and highlights the changed characters in a line.
• Compare two images side by side, as an overlay, or as a difference picture.
• Compare two folders in one tree, with the added, modified and removed files. Select a file to see its diff.
• Syntax highlighting for 21 languages.
• Ignore changes to whitespace and line endings. Wrap long lines, and show invisible characters.
• Choose the font and the size of the text in Settings.

Merge

• Merge three versions of a file, with the left side, the base, the right side and an editable result.
• Resolve each conflict with one click, or type the result yourself.
• Save a merge that still has conflicts, with conflict markers.

Command line

• The converge command compares and merges files from Terminal. Install it with Converge ▸ Install Command Line Tool….
• Use Converge as the diff tool and the merge tool of Git, Tower and Fork. converge accepts the options of ksdiff, so Tower opens all the files of a commit in one window.

See the documentation to start.