Line inserted just after marker is not treated as body

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

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

MIT License

432 stars 42 forks source link

Line inserted just after marker is not treated as body #252

Open ypresto opened 7 years ago

ypresto commented 7 years ago

That line will be removed on "Use Me".

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 (in fact, I specifically tweaked the markers there to be sure that it would handle this.) If you still see something similar, please file an issue there to let us know. Thanks 🙇