smashwilson/merge-conflicts — pull request #29 by smashwilson (2014-03-20 21:41:16+00:00)
Title: Configurable git

Adds a configuration option that lets you customize the `git` path.

![screen shot 2014-03-20 at 5 40 41 pm](https://f.cloud.github.com/assets/17565/2477960/53ef7926-b078-11e3-922f-fd8c6de32817.png)