SemanticMerge

SemanticMerge is a merge tool that understands C#, Vb.net, Java and now C. This app can detect when a method* was modified in parallel, even when no “text-block-conflicts” occur; thus enabling you to review the changes.

SemanticMerge handles structure conflicts, but will use a text-based merge to handle conflicts inside the bodies of methods, functions, properties, etc...