XCode is the totally new development environment for Panther. A merge tool is something that helps you if one programmer makes a bunch of changes to a file, and another programmer makes another bunch of changes to a different instance of the same file, and you want to fold them all together. The one in emacs is awesome. There are others which are very not awesome.