TxtDiffMerge is a free browser-based tool for comparing and merging text. Load two documents to see a side-by-side diff with line-level and character-level highlighting, or load a common ancestor as well to run a 3-way merge and resolve conflicts one chunk at a time.
JavaScript must be enabled to use the tool.