ECMerge Standard (Windows) for free try

ECMerge is a powerful utility for merging text files and synchronizing folders visually. ECMerge provides syntax colouring for C/C++, Java, XML, HTML, ASP, PHP, Visual Basic, SQL and many others languages. Unicode and 100 national encodings supported.In-line differences at word or character level, automatic formatting for XML-based files at loading