Issue #2000 Add test for conflict markers in Gemfile.lock
Raise error if Gemfile.lock contains conflict markers, closes #2000
Issue #2000 improve error message
Issue #2000 Improve test for conflict markers in lockfile
Merge remote-tracking branch 'upstream/master' into issue-2000
change to new expect syntax for rspec
Merge pull request #2007 from zofrex/issue-2000

Abort installation if Gemfile.lock contains merge conflict markers

Conflicts:
	lib/bundler.rb