Documentation

Converge compares two files, two images or two folders on your Mac. It also merges three versions of a file. The full documentation is not ready yet. Until then, this page explains how to start, and the questions on the home page have more answers.

Compare two files or folders

Choose File ▸ Compare Two Files… or File ▸ Compare Two Folders…, then choose the two files or the two folders. When the two files are images, Converge shows an image comparison.

In a folder comparison, select a file to see its diff.

Install the command line tool

Choose Converge ▸ Install Command Line Tool…. Converge copies a command to the clipboard. Paste it into Terminal, press Return, and enter your administrator password. The command installs converge, which compares and merges files from Terminal, Git and other apps.

converge Old.swift New.swift
converge old/ new/

Use Converge with Git

Add these lines to your Git configuration, for example to ~/.gitconfig:

[diff]
    tool = Converge
[difftool "Converge"]
    cmd = converge --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
    tool = Converge
[mergetool "Converge"]
    cmd = converge --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"
    trustExitCode = true

Then use git difftool to compare your changes in Converge, and git mergetool to resolve the conflicts of a merge.

trustExitCode makes Git use the exit status of converge. The status is 1 until you save the merge with every conflict resolved. Without this line, Git marks a file as resolved when the file is newer, even when it has conflict markers.

Use Converge with Tower

When you install the command line tool, Converge also adds itself to the compare tools of Tower. In the settings of Tower, choose Converge as the diff tool and the merge tool. Tower then opens all the changed files of a commit in one Converge window.

Install Tower first. If you install Tower after the command line tool, install the command line tool again.