Yeah, it's really merging that's a pain in Subversion. Easy merging has been the biggest win for me with Git.