Here's my deal in a nutshell:
I use a Macbook and a PC, where I sync 2-3 large folders between the two with Windows Live Mesh.
About 5 days ago my Macbook battery died, and I just upgraded to a Macbook Pro. Upon running Windows Live Mesh, it gives me an error that I worked on for a day and couldn't figure out. I need file syncing so I decided to upgrade my Dropbox account to 50GB.
However, my Windows PC surely has a handful of files that have been updated in that period, plus I have used my Macbook Pro to edit a few files within these folders before I upgraded Dropbox.
Last night I moved all the synced folders on my Windows PC to the Dropbox and let that sync to my Macbook overnight. Now I have the Mac version of the synced folders on my desktop, and the Windows version of the synced folders in my Dropbox.
Is there a way to compare the contents of these two folders on my Macbook Pro to determine which files have been changed, and which folder contains the most recent version?