checkoutSide takes more arguments now.

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

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

MIT License

432 stars 42 forks source link

Closed smashwilson closed 8 years ago

smashwilson commented 8 years ago

Looks like I missed a call when I refactored GitBridge to support multiple projects.

Fixes #182.