I want to synchronize a folder containing a lots of Word documents between my MacBook Air and my MacMini. Im running Lion on both machines. If a document has changed on both sides I would like to have the software offer me a merge dialog. The only software I found yet which looks like it can do is: DeltaWalker but I'm not sure if its more a Merge than a Sync Tool. Does anyone know a better solution? Preferably the tool should automatically mount the other machines drive/folder when I click sync.
I'm looking for a solution which works in my LAN. No cloud services like Dropbox please.