smashwilson/merge-conflicts — pull request #83 by emcek (2014-11-04 07:32:59+00:00)
Title: assume git is in path, works in windows and linux

I got crash of atom under windows because I forgot set where is my git. This should fix it. Git should be in PATH.