3.3.4: Tune conflicts highlighting

Both by clearly highlighting the markers, and by improving how we color
the conflicting areas themselves.

And remember: "git config --global merge.conflictstyle diff3" is your
friend!