How git cherry-pick and revert use 3-way merge