[Spec][Fixture] Add ProjectInMergeConflict
Recognize merge conflicts
Improve memory consumption
Match all possible conflict markers
Extract check for conflicts in PlistHelper#file_in_conflict?

Fix leaking file descriptor.
[Changelog] Add entry for #192
Merge pull request #192 from mrackwitz/recognize_merge_conflicts

Recognize merge conflicts