JuxtaCode is a native macOS app for reviewing Git history and resolving merges: browse commits, compare any two commits or branches side by side, follow a file's full history across renames, and finish difficult merges in a precise three-way editor. One-time purchase, no subscription, 14-day free trial.

Side-by-side diffs with commit labels showing which side of a conflict each change came from.
Three-way merge editor with live word-level differences as the result grows.
Launch from Terminal via the juxta CLI or from Tower, Gitfox, Fork and other Git clients.

Buy directly from juxtacode.app and enter the Black Friday code at Lemon Squeezy checkout to get 40% off.