Work computer is WinXP, home computer is OS X.

you may end up looking into version control.. for windows: tortoise svn

Yeah I was going to suggest version control, but it's a bit like telling someone to set up a workshop when they are just asking for a hammer.

You might try Google docs with copy/paste acting as "save this version" and "load this version", which might carry you along until you find out that what you really want is a workshop.

You can use winmerge to see differences between two files and between two sets of files.

Heh, I figured it would be something like that. I guess most people who are editing shared HTML docs are doing it with server-side version control! Something I mentioned to my boss, but I think they still consider it on the "nice to have" list. Argh.

Eide you can just make a quick local repository on your windows machine. I can walk you through it. It's pretty awesome

Basically you create a folder in windows

Tell TortoiseSVN to create a repository there

Then right click it and 'checkout' that empty folder to another folder

Viola, you have a repository and a working copy. The second folder, you make changes, and anytime you want to save the state of everything you right click the working folder and hit commit. the user interface is just awesomely simple.

Hit me up on IRC sometime