For diffs that include the common ancestor, add this to .gitconfig:

  [merge]
  conflictStyle = diff3