.gitconfig: diff3 style merge diffs.