git: use diff3 for conflictstyle

Provides extra info on the conflicted file, instead of showing just the
new and the old, it also provides the base. This should help with
deciding which side to pick or better integrate both sides of the
conflict.