GitDifferent

About

GitDifferent is a Mac git client with a built-in merge tool. Its three panes (Ours, Result, and Theirs) are aligned row for row, with changed words highlighted inside each line. You can take chunks with a click, edit the result directly, and move between conflicts without leaving for your editor. Stacked PRs appear as ordered chains, each with its check status, and merging unlocks only when every layer underneath is green, with an explanation when it is not.

GitHub and GitLab reviews happen inside the client, using the gh and glab credentials you already have, with inline comments, approvals, and resolved threads. The app also includes line-level staging, interactive history (rebase, squash, cherry-pick, and reorder), worktree hooks that run your script when a new worktree is created, a unified local and remote branch view with ahead/behind counts, and split and unified diffs with syntax highlighting for 89 languages.

GitDifferent is free for up to 3 repositories, with no card required. A one-time $49.99 license unlocks unlimited repositories, can be used on 3 of your computers, and includes all updates to the current generation, with no subscription. It can be downloaded directly or installed with Homebrew.