Commit fba9f79c4f8a59659511cef89c1fca8809a5dce4
2020-07-23T14:22:34
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.