joust888

Also try winmerge, it does the same and is a free open source project as well. It helps especially if you have 2 different contributions changing the same exact code and not just adding new lines. It gives you the opportunity to find these pieces of code quickly and edit it appropriately. Probably not going to work for complete newbies but if you have any idea of PHP (or programming in general) it should help you out.