Adding diff3 conflictstyle and rerere