Ash Wilson

Nice! This one's been bugging me for forever, and it only repros for me very, very occasionally. @exwar You mentioned that it happened every single time for you - if...

Nuts - if #193 is any indication, there's still a way this one can happen. :rage: At least I've fixed it for some of you!

:+1: Sounds good to me. It'll take a bit of work so I doubt I'll get to it in the next release or so -- I've been focusing on knocking...

Ah ha, it looks like TextEditor has an [API that lets you specify what an "undo" is](https://atom.io/docs/api/v1.0.0/TextEditor#instance-transact). I should wrap all of the resolution code in undo transactions so that...

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This issue still applies...

You can manually configure a path to your `git` executable in the settings for the package if it's not in any of the places we're looking at right now. That...

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...

Oh, it _is_ like an enhanced version of a three-way diff marker - I hadn't thought of that. Diff3 markers show you the content from the common ancestor, while this...