Handle copy of a file/symlink already modified in this commit