I've been considering Subversion but that means keeping a central server rather than more arbitrary relationships.

Unison is my tool of choice. When I was last comparing, it had the best management of sync and conflict resolution. It's also available across *nix and Windows with a portableapps version.

I was hoping I'd missed an Rsync command switch but so be it. Rsync is is great for what it does.