If branching and merging matters to you at all, switch to git or mercurial immediately.

You won't look back.