For Mac · Diff and merge
Two sides. One result.
Diff and merge, the way macOS intended.
Converge is a fast, native diff and merge tool for the Mac, made with SwiftUI. Compare text files, images and whole folders. Then resolve conflicts with confidence.
Use it as the diff tool and the merge tool of Git, Tower or Fork. Or open two files from the File menu.
From the developer of Charles Proxy.
macOS 15 or later · Free for 14 days
What it compares
Text, images, folders and merges.
Open two files, two images or two folders, and Converge shows the correct comparison. Open three versions of a file from Git, and Converge merges them.
Text
Side-by-side text diff
Converge puts the two files side by side and scrolls them together. It colours each added, removed and modified line, and highlights the changed characters in a line.
import Foundation struct Greeter { let name = "World" func greet() { print("Hello, \(name)") } }
import Foundation struct Greeter { func greet(name: String) { print("Hello, \(name)!") } func wave() { print("Hi") } }
-
Images
Image comparison
Compare two images side by side, as an overlay, or as a difference picture that shows each changed pixel. Magnify an image, and Converge shows each pixel sharply.
Before After Changed pixels in red -
Folders
Folder comparison
See the added, modified and removed files of two folders in one tree. Select a file to see its diff in the same window.
-
Command line
Git, Tower and Fork
Install the
convergecommand from the Converge menu. Use it as the diff tool and the merge tool of Git. It accepts the main options of ksdiff, so Tower can open a whole commit in one window. -
Syntax
Syntax highlighting
Converge colours the code of 21 languages, in the diff and in the merge. So you read a change as code, not as plain text.
Merge
Three-way merge
See the left side and the right side, with the merged result between them. Show the base column too, when you want it. Resolve each conflict with one click: use the left side, the right side, or both in either order. Or type the result yourself.
let x = 1 let y = 2 print(x)
let x = 1 let y = 2 let z = 3 print(x) print(z)
let x = 1 let z = 3 print(x) print(z)
Details
Made for the Mac, and for your code.
Fast with large files
Converge is a native Mac app. It maps a large file into memory and draws only the lines that you see, so a large file opens at once.
Every file of a commit
Open the files of a commit from Tower, and Converge shows them in one window, in a tree. Go from file to file with no new window for each one.
Ignore what does not matter
Ignore changes to whitespace and line endings, so the diff shows only the real changes. Show or hide the highlights of the changed characters.
Your text, your way
Wrap long lines, show invisible characters, and choose the font and the size of the text in Settings.
From change to change
Go to the next or the previous change, or to the next conflict, with one command. You do not scroll to find the next difference.
Safe merges
Save a merge that still has conflicts, and Converge writes conflict markers, as Git does. Until you resolve every conflict, converge exits with status 1, so Git does not mark the file as resolved.
Private by design
Your files stay on your Mac.
Converge reads and writes only the files that you open. No part of them leaves your Mac.
- No accountDownload Converge and compare. You never sign in, also after you buy.
- No uploadsConverge sends no part of your code or your images to us or to anyone else.
- No subscriptionPay once, and get every update to version 1.
Questions
Before you compare
How does the trial work?
Converge has every feature for 14 days, with no licence. After that, it continues to work, and it shows a short reminder before each comparison until you enter a licence.
How do I use Converge with Git?
Choose Converge ▸ Install Command Line Tool… to install the converge command. Then make Converge the diff tool and the merge tool of Git. After that, git difftool compares in Converge, and git mergetool merges in Converge.
Does Converge work with Tower and Fork?
Yes. When you install the command line tool, Converge also adds itself to the compare tools of Tower. Then choose Converge as the diff tool and the merge tool in the settings of Tower. converge accepts the main options of ksdiff, so Tower opens all the files of a commit in one Converge window.
Fork, and other Git clients that can use an external diff tool, can use converge too.
Does Converge send my files anywhere?
No. Converge reads and writes only the files that you open, on your Mac. It sends nothing about your files to us or to anyone else. See the privacy statement.
Can I use one licence on several Macs?
Yes. A licence is for one person, on all of their own Macs. Each other person who uses Converge needs their own licence.
Are updates free?
Every update to your major version is free, for example every 1.x release. A new major version will be a paid upgrade, at a lower price for owners. Converge checks for updates once a day.
Which languages does Converge highlight?
Swift, Python, JavaScript, TypeScript, Go, Rust, C, C++, Java, Kotlin, C#, Ruby, PHP, Objective-C, HTML, CSS, JSON, YAML, Bash, Markdown and JSP. Converge shows a file in another language as plain text.
Is there a version for Windows or Linux?
Not at the moment. Converge is for Mac only.
Pricing
Buy Converge. No subscription.
Try Converge free for 14 days, with every feature. Then buy a licence.
Converge
- Text, image and folder comparison
- Three-way merge with conflict resolution
- The
convergecommand for Git, Tower and Fork - Syntax highlighting for 21 languages
- Every 1.x update
By buying a licence, you agree to the Terms.
A licence is for one person, on all of their own Macs. Each person who uses Converge needs their own licence, and you can buy several in one purchase.
Each licence includes every update to its major version, for example every 1.x release. A new major version will be a paid upgrade, at a lower price for owners.
After the trial, Converge continues to work. It shows a short reminder before each comparison until you enter a licence.
Paddle takes the payment. Sales tax or VAT can apply, as the law of your country requires.
If Converge is not right for you, you can get a full refund within 30 days. See the refund policy.
The checkout did not open. Try again, or email support@convergediff.com.
Bring your changes together.
Download Converge and try every feature free for 14 days.
macOS 15 or later