Try WinMerge for a free open source tool.
But you might prefer the free ExamDiff or its shareware version ExamDiff Pro
Or Araxis Merge $$
Or MergeRight $$