Diff & merge
A multi-file diff workspace for files, folders, patches, and Git changes, with smart alignment, hunk actions, editable results, and true three-way merge resolution.
Compare files in a dedicated tab (side-by-side or unified) with per-line backgrounds, intra-line word emphasis, change ribbons, and a full-document overview.
Diff a file against HEAD (C-x v =), a commit, a branch or tag, the clipboard, empty text, or another file. Review a multi-file patch, every staged or working-tree change, or compare two folders recursively. Ignore whitespace or case, use smart alignment, collapse context, wrap long lines, swap sides, and export a patch.
Apply changes with guarded, undoable gutter actions or open an editable Result draft. Git reviews add Stage, Unstage, Revert, Copy Hunk, and Open Changed Line. The merge resolver reads Git’s base, ours, and theirs stages, combines compatible edits automatically, and offers explicit choices for divergent regions. Changes on neighbouring lines form one conflict, as in Git, and a complete resolution saves and stages the file.