Ash Wilson

Ah, great question. Unfortunately you can't, yet, but it would be great to be able to. This'll be a bit tricky to implement because `mergetool` expects a [certain protocol](http://git-scm.com/docs/git-mergetool) for...

> AFAIK from using p4merge and kdiff3 it tries to merge by itself but if it bumps to conflicts it does not give you the state where it left off....

> As a user I was pretty surprised that merge-conflicts didn't support git-mergetool integration. Disappointed :-/ It's on my radar! As you can see above, it's a little more involved...

> Yeah understood, just wanted to +1 didn't mean to be a downer. Thanks for creating this, I just don't know how to really use it without merge tool support...

: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...

This looks like a truncated installation to me. Try uninstalling merge-conflicts, restarting Atom competely, then reinstalling.

: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. I don't think this...

I'm :-1: on preventing edits outside of the conflict areas. Sometimes, resolving conflicts sensibly requires you to edit other parts of the file, to keep the semantics of the surrounding...

It already exists :grin: Right-click anywhere in the conflict and you can choose to resolve "ours then theirs" or "theirs then ours" from the context menu.