Fix #372 - Do not create conflicted copies if the client has a newer version of a file, and upstream that file

This worries me.  How can we rely on times at all across the network?  Did we create this diffNode on the same machine?