Terminal-native 3-way git mergetool and diff viewer

git go conflict-resolution cli golang terminal neovim tui conflict mergetool diff-viewer diff-tool merge-conflict diff3

• Updated Sep 11, 2026
• Go

A JavaScript library for text diffing and three-way-merge

javascript diff merge hacktoberfest diffutils diff3 diffpatch

• Updated Nov 12, 2026
• JavaScript

A Rust and TypeScript library for merging conflicting text edits without manual intervention. Mirror of https://git.schmelczer.dev/andras/reconcile

rust sync synchronization typescript text wasm text-editor crdt operational-transformation ot collaborative-editing diff3

• Updated Nov 12, 2026
• Rust

Build script of BusyBox for WebAssembly (wasm) using Emscripten

zip webassembly wasm emscripten busybox diff3

• Updated Dec 21, 2020
• C

Highlight the difference two or three string-tables (diff3)

diff abap text diff3

• Updated Sep 2, 2026
• ABAP

Finally a way to merge json!

json merge jsondiffpatch jsondiff jsonpatch diff3

• Updated Sep 7, 2019
• Java

a toy git writing in rust just to learn how git really works

git rust cli merge myers diff3

• Updated Dec 28, 2021
• Rust

Tests for ABAP Diff3

diff abap text diff3

• Updated Apr 30, 2025
• ABAP

Official issue tracker, language requests, and community discussions for TreeResolve

merge-conflicts tree-sitter developer-tools vscode-extension git-merge diff3

• Updated Nov 1, 2026

ffs-diff: structural diff + three-way merge for the estate, ffs/tree-sitter aware

cli tree-sitter diff merge estate bun diff3

• Updated Nov 10, 2026
• TypeScript

🧵 Zero-dependency unified diff patch engine & diff3 three-way merge toolkit for AI-agent workflows

python cli diff merge zero-dependency patch unified-diff diff3 ai-agent

• Updated Nov 8, 2026
• Python

A simple implementation of Myers' diff algorithm and a three-way merge algorithm (diff3) in Python.

diff python3 myers-algorithm diff3

• Updated Feb 24, 2025
• Python

Three-way JSON merge that returns structural conflicts instead of last-writer-wins

json typescript three-way-merge zero-dependencies diff3

• Updated Aug 20, 2026
• TypeScript

GNU Diffutils 3.12 migrated to C#/.NET 10: cross-platform implementations of diff, cmp, diff3, and sdiff for Windows, Linux, and macOS.

cli diff csharp cross-platform command-line dotnet posix gnu cmp diffutils text-comparison file-comparison unified-diff diff3 gnu-diff sdiff gnu-utils gnu-diffutils

• Updated Oct 24, 2026
• C#

Git rebuilt from first principles in Go — 17 commands incl. three-way merge (diff3) and rebase, byte-for-byte SHA parity with native git proven by a differential suite. 2× faster bulk ingest, 28.5K obj/s fsck. ▶ Playable sandbox: brickster241.github.io/GitEngine

git go golang distributed-systems version-control developer-tools vcs sha1 command-line-tool rebase git-porcelain systems-programming content-addressable-storage differential-testing three-way-merge content-addressing git-plumbing low-level-design diff3 git-internals

• Updated Sep 3, 2026
• Go

A diff and a diff3 toolset I develop for my own education/enjoyment. It aims to be a stripped down version of the standard diff and diff3 commands on Linux.

diff cmake cpp cpp14 merge googletest cpp11 cpp17 diff3

• Updated Jul 29, 2020
• C++