Commit d219f183308acdda359bff4261e6ff7cd249670f

Stefan Sperling 2020-07-23T14:22:34

test_cherrypick_symlink_conflicts forgot to run 'got add' on a file; fix this