3.2.0: Improved conflicts highlighting

Especially for diff3 conflicts, where we now show unchanged lines vs base in context color:
https://stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git

With this release, we are also better at detecting conflict markers in git diff output.