Add merge.conflictstyle=diff3
see http://qiita.com/hchbaw/items/1191c2627307a4673b1b