As others have said, "source control" (also known as "SCM") is what you want; in fact, what you wrote:
both work on the source code at the
same time without taking turns, and
then there was someway we could
combine our changes easily
...is pretty much the definition of source control. (There's one additional major feature of SCM, which is history tracking, as Andres mentioned.)
Subversion is definitely the product you should be trying out. It's well documented, modern (ie: none of the "older" issues of CVS) and relatively simple compared to more powerful distributed systems like Git.
One important note: "combining our changes easily" is something that takes some dedicated learning and practice. "Merging" is the practice of taking code from two different sources and unifying them in a way that doesn't break things. It can be tricky and is quite confusing until you gain a deeper understanding of how it works. I'd recommend setting aside a day with your partner dev and practice doing dress-rehersals of combining your changes before you try doing it on real code. Again: Subversion is a great tool here because the documentation is very good and clearly written.