carlhuda/bundler — pull request #2007 by zofrex (2012-06-29 23:24:13+00:00)
Title: Abort installation if Gemfile.lock contains merge conflict markers

Proposed fix for issue #2000 - execution is fine, tests are possibly a bit icky though?