Text Diff & Merge Tool — Merge Conflict Resolver & 3-Way Merge

local processing
Resolve git merge conflicts online. Paste Base, Ours and Theirs for a three-way merge, or paste a file with git conflict markers and accept ours, theirs, both or your own edit per conflict. Nothing is uploaded.