This repository has been archived by the owner on Nov 8, 2017. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 42
Fix diff3 markers #249
Comments
It seems markers are detected correctly, but headers are misplaced. It perhaps happen without diff3. |
@ypresto and missed header for |
It has same color to background. So it looks missing but is actually shown there. |
It can be confirmed by that only one |
👋 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 🙇 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
I have in my
.gitconfig
:And in conflicts:
![image](https://cloud.githubusercontent.com/assets/5620073/18609957/745cae04-7d17-11e6-9ca5-2b9470474073.png)
Without
merge-conflicts
package:The text was updated successfully, but these errors were encountered: