Commit Briefs
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.
add cherrypick test for symlink conflict cases
This test accepts the current behaviour, even though the current behaviour isn't ideal in some cases.