smashwilson/merge-conflicts — pull request #27 by smashwilson (2014-03-19 23:25:33+00:00)
Title: Be more careful about the use of git and project directories

I've been assuming that `atom.project.getPath()` is the root directory of both the git repo and the Atom project, which is usually true, but not always. Use the git repo's working directory instead, and pass absolute paths to other bits, to account for the case where you open Atom in a subdirectory of the repo.

Fixes #18.