Git cannot be found in any of the default locations

[adam-knights]

Windows 7, Atom 1.0.11, merge-conflicts 1.3.5.

When I attempt to run merge-conflicts I get

git can't be found in any of the default locations!

I checked my PATH variable and git is there C:\Program Files\Git\cmd, in the command line git works.

More than happy to provide further info if required, and maybe even debug myself, in the meantime I'd love help getting this working via a workaround. Sadly my atom has issues showing settings in the GUI due to bugs in atom when behind a corporate firewall/proxy, so if you could point me somewhere to add the setting for git manually that would be great.

[adam-knights]

Running atom as an administrator makes this issue go away, not sure whether this is expected, or should it be ok without running as administrator?

[smashwilson]

You can manually configure a path to your git executable in the settings for the package if it's not in any of the places we're looking at right now.

That does seem like a reasonable path to add to the search paths, though.