Hey Everyone,
Our team at Big Fish Games has developed an unoffical open source merge tool for handling cocos creator scenes and prefabs. This should be useful for any teams that need a stop-gap before the offical cocos creator merge tool. It should work for both git and hg (and in theory svn).
-Mike