search

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Allow use as a git merge tool #213

Open ChristopherKing42 opened 8 years ago

ChristopherKing42 commented 8 years ago

Git has built in support for interfacing with external merge tools. We should add support for that:

https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#External-Merge-and-Diff-Tools

smashwilson commented 8 years ago

There's already been a script created for this in #195, but it isn't exposed in any obvious way yet.