SemanticMerge now supports Java - language-aware merge tool Posted by psantosl on Thursday May 30, 2013 @04:49PM from the semanticmerge.com dept. http://www.semanticmerge.com/java.html ( 1 comment | on HN )
Semantic is a free beta and we're giving unlimited licenses to coders sharing feedback.
We're now starting to work on C and then C++ (both using libclang) and hopefully able to handle the Mac OS GUI request soon too (http://plasticscm.uservoice.com/forums/196398-mergebegins)
Thanks!