CocoaPods/CocoaPods — pull request #2067 by segiddins (2014-04-17 20:58:41+00:00)
Title: Helpful exception when reading version information with merge conflict

related to https://github.com/CocoaPods/CocoaPods/issues/1853, https://github.com/CocoaPods/CocoaPods/issues/2065, https://github.com/CocoaPods/CocoaPods/issues/2056 etc.