I use the HTML report feature of ECMerge (www.elliecomputing.com). You can customize the blocks to output in the report (only differences, conflicts or all) with an optionnal context.
The great feature is that ECMerge does 3-way diff and merge for $50 only !!! -- <http://forum.pspad.com/read.php?2,33044,33279> PSPad freeware editor http://www.pspad.com
