https://www.semanticmerge.com supports .NET languages, C/C++, and Java (with support for JavaScript planned). I would be interested to here any anecdotes from users of this product!
While struggling to search for this tool, I discovered
https://www.gmaster.io: a beta Git client (for Windows) from the same company extending these ideas closer to the VCS level.
Codice Software's main product appears to be PlasticSCM; they've done a bit of marketing here on HN without catching much interest.
While struggling to search for this tool, I discovered https://www.gmaster.io: a beta Git client (for Windows) from the same company extending these ideas closer to the VCS level.
Codice Software's main product appears to be PlasticSCM; they've done a bit of marketing here on HN without catching much interest.