I hesitate to bring up a retail product after all the freeware recommendations you have received, but Visual SlickEdit is a terrific programmer's editor which includes the ability to compare text files. (They call it DiffZilla, complete with a Godzilla icon, and get style points for that <g>). File comparisons are visual and color coded, of course, and you can merge lines or blocks from one file to the other. You can download a free demo of Visual SlickEdit at

http://www.slickedit.com/purchase/pu_regtrial.php

Mike