git merge conflict handling

I've long told git to use diff3 for it's merge conflict marking, since when I get conflicts like that, I usually want to understand what the original code was to judge each side's changes. It's a bit arse, though, and often annoyingingly includes lots of identical lines in the conflict, which even with per-word-diff-syntax-highlighting, is annoying to read. So, 'twas nice to see that git had added a new conflict marker type, zdiff3, in version 2.3.5 (github link, could not find it in the actual git changelog for some reason), official docs here.