Without starting a VCS war: +1 for Mercurial. If, like me, you do not have a good memory for arbitrary syntax, then mercurial is a lot easier. Takes a bit of

Without starting a VCS war: +1 for Mercurial. If, like me, you do not have a good memory for arbitrary syntax, then mercurial is a lot easier. Takes a bit of cognitive load away from using your VCS. It is thus also much easier to learn than git, so the cost of giving it a whirl is much lower. It also has that nice feeling of being designed with the end user interface in mind, which is satisfying if you care about such things. I enjoy using tools that give me clarity about what I'm doing, and mercurial achieves this by carefully separating the different actions VCS must support. (I regularly use both systems and have done so for years. I am not a power user. I use mercurial whenever I have a choice).