Three-Way Text Merge & Conflict Resolver

Merge two edited versions against a common base, preserve independent changes, and mark overlapping edits for manual review.