Text 3-Way Merge
Merge two divergent text versions against a common base with diff3-style conflict markers.
About this tool
Paste a common ancestor (base) plus two competing edits and the tool produces a merged result, inserting <<<<<<< / ||||||| / ======= / >>>>>>> markers around any chunk where both sides diverge from base. Line-based, LCS-driven.