The host machine for the directory I am distributing and syncing does not belong to me and cannot be dropbox'd. It's contract work, we don't always get to deci

The host machine for the directory I am distributing and syncing does not belong to me and cannot be dropbox'd. It's contract work, we don't always get to decide on our toys of choice. I need the explicit merge awareness anyway, not blind single-source propagation. When I say that I need a replacement for Unison, I mean that I've already searched exhaustively and found nothing beyond slapping one together with a script. I'm probably going to have to make something myself.