Riffle

Riffle is a native file diff comparison and merging tool for macOS developers.

Built in Swift, it supports Apple Silicon and Intel Macs, and can handle file, folder, image, and Git changes locally. It provides clear two-way diffs, editable three-way merging, folder comparison, and a complete Git review window, allowing users to view changes in the working directory, staging area, branches, commit history, and GitHub Pull Requests. Developers can stage, unstage, and discard changes by file or Git hunk, and view line-by-line Blame, file history, and changeset commits alongside the diffs. The software supports character-level and word-level highlighting, diff folding, soft line breaks, display of invisible characters, multi-tag comparison, image pixel inspection, synchronized scaling, and color difference analysis. It includes 47 built-in languages ​​and 62 themes, and can import resources from VS Code, Shiki, and TextMate. Riffle integrates with git difftool, Tower, command line, Claude Code plugin, and MCP service, accurately displaying the changes made by the AI ​​agent in this round, preventing irrelevant uncommitted files from being included in the review. All operations are performed locally, without reading clipboard content or uploading code or project data.