diff3

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

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

Terminal-native 3-way git mergetool and diff viewer

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

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

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

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

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

Tests for ABAP Diff3

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

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

Build script of BusyBox for WebAssembly (wasm) using Emscripten

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.

Finally a way to merge json!