4 ms·git never did...by click170 15y agogit never did..._delirium 15y agoAs a closer comparison, DropBox doesn't either; it just dumps a file named "yourfilename (Other Person's conflicted copy 2011-11-03)" in the directory.