Commit Briefs
add an output argument to create_fileindex_entry()
Avoids a pointless search of the file index in the case the caller needs to use the newly created file entry.
restore unversioned file test case in test_cherrypick_symlink_conflicts
One part of current behaviour is to delete an unversioned file and replace it with a symlink; that's very bad in case the user wants to keep the file.