Probe for git in a few well-known locations.
Locate git at package load.
Modernize the configuration.
Update conflict marker spec.
Update GitBridge spec.
Update the ResolverView spec.
CHANGELOG entry.
Merge pull request #88 from smashwilson/git-search

Search for git