How git cherry-pick and revert use 3-way merge (via MazeChaZer) — discussion

#vcs