Should document merge.conflictstyle = diff3

I think we patched subversion in FreeBSD to default to diff3 style conflicts instead of diff2.  Git defaults to diff2, but can be changed to use diff3 via this snippet in .gitconfig:

```
[merge]
	conflictstyle = diff3
```

We should document this somewhere.