smashwilson/merge-conflicts — pull request #88 by smashwilson (2014-11-09 14:08:12+00:00)
Title: Search for git

Fixes #84 by searching for the git binary first in your PATH, then in a short set of common locations.