Fix diff3 markers - Githubissues

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

MIT License

431 stars 42 forks source link

Open sergeysova opened 8 years ago

sergeysova commented 8 years ago

I have in my .gitconfig:

[merge]
    conflictstyle = diff3

And in conflicts:

Without merge-conflicts package:

ypresto commented 8 years ago

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

sergeysova commented 8 years ago

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

ypresto commented 8 years ago

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

ypresto commented 8 years ago

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

smashwilson commented 7 years ago

:wave: 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 🙇