So I have done countless cherry picks before and it seems that I must fail at life with this right now, I am trying to cherry pick from one branch to another which should be
parent1 commit change widget
parent2 commit change clutter
merge commit (contains both changes) widget clutter
git cherry-pick -m 1 merge-commit (parent1) diff of merge and parent2 merge - parent2 = widget
git cherry-pick -m 2 merge-commit (parent1) diff of merge and parent1 merge - parent1 = clutter