chocolatey/ChocolateyGUI — pull request #182 by gep13 (2014-10-23 08:48:06+00:00)
Title: Updating .gitignore file

- Added additional check to prevent *.orig files, which are generated by kdiff when doing a merge, being checked into source control