mergely
Merge is an online merge and diff tool that allows you to share and save your documents.
SemanticMerge - The diff and merge tool that understands C#, Vb.net, Java and now C
SemanticMerge – The diff and merge tool that understands C#, Vb.net, Java and now C