I know there are better tools, but honestly I still am most comfortable with whatever vi I can find and plain old cvs. It does surprise me, however, how many programmers (most often addicted to a certain studio of the visual sort...) I run into that don't bother with version control at all.