Use diff3 style for conflicts and enable rerere