Re:Dropbox: the new file system of the web
by AndrewDucker on Friday December 30, 2011 @05:57AM
(#3407259)
They don't have merge working for _anything_. They simply bypass it by noting that the same file has changed on two computers at once and saving two copies in the folder, for the users to merge themselves.
Much safer that way.