CocoaPods/Core — pull request #100 by luisdelarosa (2014-04-05 21:53:33+00:00)
Title: Show informative error message when a merge conflict is detected in a YAML file.

This fixes issue #69.
All in one nice, squashed commit.
:smiley: