Fix the "update" command so that is does not report conflicts on files that
have been added to the current check-out but not yet committed.  The added
files are simply carried forward into the updated version.