merge-tool

A native home for coding agents — many Claude Code agents in their own git worktrees with live status, plus a light IDE and Git client to review and land their work. GPU-rendered, Rust, macOS + Linux.

Visual Diff‑Merge: Effortlessly compare and merge code in a responsive split‑view interface, with interactive change selection and support for over 180 programming languages.

A Vim9.1 plugin for managing three-way merges; pure vim9script.

🇧🇷 🏦 📋 Brazilian banks: MergeTool - The C# .NET tool used to merge and keep data from the Bancos Brasileiros repository updated

Инструмент семантического сравнения и трёхстороннего слияния (решения merge-конфликтов) табличных документов 1С в формате .mxl (MOXCEL).

Free, open-source diff & merge app for macOS: compare text, pasted snippets, images, and folders, resolve 3-way merges, and browse git history. Native SwiftUI + Liquid Glass.

Meld-flavored side-by-side diff & merge in a Chrome app window. Vanilla JS, no build step — the Go binary is the running git mergetool: pick ours/theirs/both per conflict, it writes the file back and exits.

The merge editor for VS Code and Cursor — a real three-pane merge editor with color ribbons, a conflicts dashboard, undo history, and a side-by-side diff.

a simple git merge tool

The modern, customizable Linux diff and merge experience. Compare files and folders - plus images, documents, tables, and web pages - with synchronized side-by-side views, .gitignore-aware recursive folder sync, reusable profiles, and safe three-way merge, all powered by Rust, Qt 6, and Kirigami.

🤖 AI Vibe-Coding · 19 项用例 + 5 轮 E2E · 实际岗位手动验证 — Excel/CSV 小表并大表智能合并，纯 Python 标准库零依赖

Code reader, side-by-side diff viewer, git client and merge tool for Linux and macOS, with native GUI and terminal frontends, built in Rust

A friendly desktop Git client with a real merge tool, lanes and Claude built in.

Manifold: free, open source Git client for Windows and Linux, built in Flutter, not Electron. A spectral engine turns commit history into a coupling graph: it predicts merge conflicts before you merge, X-rays unfamiliar codebases, and grounds AI review in structure, not grep. GitHub, GitLab, Gitea, or fully offline with local PRs. Public beta.

Herramienta de escritorio para comparar código: carpetas completas, archivos individuales o pegando directamente desde el portapapeles. Visor de diferencias con Monaco Editor, comparador de imágenes con slider e interfaz en 5 idiomas.

Compare (and possibly Merge) two namespaces

Free, open-source Git client with a beautiful commit graph, side-by-side diffs and a three-way merge tool — macOS, Windows, Ubuntu and a Paseo plugin

🚀 The ultimate power-user utility to Recover, Export, Merge, Audit, and Sort Chrome extensions. Optimized for Chrome 144 and Latest for Manifest V2/V3 extensions.

Version control for a working tree of source files. Where tree-sitter can parse a file, astvcs stores an abstract syntax tree and diffs and merges structural edits. Everything else is stored as UTF-8 text with a line-oriented diff.

History-first Git desktop client: commit-graph search, inline and side-by-side diffs, a 3-way merge editor, and cloning from GitHub, GitLab and Bitbucket. Windows, macOS (Apple silicon), Linux.