Git cherry-pick and revert use 3-way merge

There is a discussion on Hacker News, but feel free to comment here as well.