Show diff if cherry-pick fails