diff3 conflict style

as learned in http://blog.ezyang.com/2010/01/advanced-git-merge/

Displays conflicts as a three-way merge instead of just showing the two
alternatives.