tesuji #1 Subversion for version control and tortoise svn as a front end which has a very handy inbuilt diff.