CocoaPods/CocoaPods — pull request #571 by xslim (2012-10-04 15:50:37+00:00)
Title: Podfile & Lockfile error handling

Errors in syntax can come from bad merging for example.