add common git config
[git] diff3 merge style and rerere