Fix diff3 markers

[sergeysova]

I have in my .gitconfig:

[merge]
    conflictstyle = diff3

And in conflicts:

Without merge-conflicts package:

[ypresto]

It seems markers are detected correctly, but headers are misplaced. It perhaps happen without diff3.

[sergeysova]

@ypresto and missed header for ======

[ypresto]

It has same color to background. So it looks missing but is actually shown there.

[ypresto]

It can be confirmed by that only one = is shown (and rests are overlapped with header).

[smashwilson]

👋 Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This one should be taken care of by the new git and GitHub package for Atom. If you see something similar, please file an issue there to let us know. Thanks 🙇