lenormf/kakmerge

A Kakoune-based mergetool for Git

Language: Shell - Size: 84 KB - Last synced at: about 1 month ago - Pushed at: about 2 years ago - Stars: 39 - Forks: 4

bircher/php-merge

Php library to merge text. 3 way merge like git in php.

Language: PHP - Size: 69.3 KB - Last synced at: 8 days ago - Pushed at: over 3 years ago - Stars: 35 - Forks: 6

kayceesrk/mergeable-vector

Mergeable vectors with operational transformation

Language: OCaml - Size: 16.6 KB - Last synced at: 4 months ago - Pushed at: over 8 years ago - Stars: 7 - Forks: 0

CakirsSeyma/ComparingSortingAlgorithms

Language: Jupyter Notebook - Size: 840 KB - Last synced at: over 1 year ago - Pushed at: over 1 year ago - Stars: 0 - Forks: 0

zawys/vscode-as-git-mergetool

VS Code extension providing diff editor layouts & more for 3-way merging

Language: TypeScript - Size: 6.34 MB - Last synced at: over 2 years ago - Pushed at: over 3 years ago - Stars: 42 - Forks: 1