A merge tool that understands your source code... join beta | Dark Hacker News