Kaleidoscope

Kaleidoscope is a diff and merge utility that integrates tightly with Git, allowing users to examine file history, view commit details, and resolve merge conflicts through a visual interface. It presents three‑way merges with side‑by‑side views of base and conflicting versions, and shows commit messages alongside the changes for context.

The tool supports character‑level text comparison, collapsing unchanged sections and providing navigation shortcuts between edits. It also offers pixel‑perfect image diffs, with split, blink, and drag modes to highlight visual differences, and can compare entire directory trees, letting users copy items between folders and filter results by file type or name.

Designed for developers and designers who need to track changes across code, assets, and folder structures, Kaleidoscope emphasizes a clean, Mac‑styled UI and interactive history of recent comparisons per repository. It is positioned as a stable, community‑liked solution for everyday diffing and merging tasks.