If git looks too scary, we could also try mercurial (a.k.a. hg). That's what I used for years before converting to git. It's much more intuitive than git, and it's written in Python and designed to be OS-independent, whereas git is optimized to work on Linux.

The advantage of git is that we get github hosting for free. I think there are similar things for hg, but I haven't looked into them. The hosting is important because with a distributed RCS, we'd all have separate repositories and need a way to access each other's.

For the moment, I think diff or winmerge should be good enough for finding the differences between versions and merge. There are also merge tools based on diff, but since I usually do solo projects, I haven't had much use for them and wouldn't know which ones to recommend. Even with git, we'd still need to use a separate merge tool, so finding one you're happy with should be a good start.

-- I'm not mad at you, just Westphalian.