Sending this update as Elijah is on vacation. This only updates the test case based on feedback from the list.
Base Ref: master Web-Diff: https://github.com/benpeart/git/commit/0ab3816d61 Checkout: git fetch https://github.com/benpeart/git merge-recursive-v2 && git checkout 0ab3816d61 ### Patches Ben Peart (1): t3507: add a testcase showing failure with sparse checkout Elijah Newren (1): merge-recursive: preserve skip_worktree bit when necessary merge-recursive.c | 16 ++++++++++++++++ t/t3507-cherry-pick-conflict.sh | 13 +++++++++++++ 2 files changed, 29 insertions(+) base-commit: ffc6fa0e396238de3a30623912980263b4f283ab -- 2.17.0.gvfs.1.123.g449c066
