Commit af57b12ab516c7fa5ecc8bd00db5637240411ed7

Stefan Sperling 2020-07-23T14:21:30

add symlink support to 'got cherrypick'; test non-conflict cases only for now