A programming-language-aware, refactor-ready merge tool
codicesoftware.blogspot.comIt is able to identify methods that have been moved and modified, totally reorganized classes, find conflicts at the semantic level and may more... hope it helps!
Regarding the diagrams: Why Comic Sans?
Good call, monospace fonts (Consolas, Lucida Console) should have been better.
Our designer was on vacation! :)
Can this be easily integrated into SVN, TortoiseSVN, and git?
Yep! It is a client app so really easy. Once we go live (in a few days), we'll post the info about how to get it configured with every scm! :-)
Can you please send a git-mergetool patch to the git mailing list? This will save everyone the trouble of needing to discover how to configure it. Feel free to contact me offline if you need some pointers.
Hi David, sure, I'll try to contact you and I'll send you the config info.
Will I able to use this with my git/mercurial installation?
Yep, it can be setup to be used with ANY version control. We already tested it with Git, Hg, SVN, TFS... and it will be usable from P4 and others
What languages are supported? The examples look like C#?
yep. we started with c#. java will be there too, later c/c++ and after all that it is a matter of listening to our users and react as fast as we can! :-) I'd love to have javascript soon too.
I'm really impressed, great work!
I have to see it to believe it!
Cool work! I'll give it a try.