Revert "git: use default conflict style"

This reverts commit 0259cbe2d552ed852ba1d3234eb4c6a33a9dcd44.