Not to knock on anyone, but if you're responsible for merging files you really should be familiar with diff/patch. If you're in the Windows world it can be a bit foreign, but there are some implementations out there that you can use. I haven't used it, but WinMerge (
http://winmerge.sourceforge.net/) looks like it would work for this purpose.
Keep up the good work vesuvias
