If you have not tried Git yet you should give it a try (but keep in mind it may take some time until you really appreciate its power).
I have been working with Git for at least 2 years and I am amazed how flexible / powerful it is. Actually it is so powerful I still learn new stuff about it almost every other day! Bellow you can find some useful resources to learn a little bit more about it:
- http://blip.tv/open-source-developers-conference/git-for-ages-4-and-up-4460524 (you need to know the basics of Git to get the most from this one)
Hope you find this information useful!