Show informative error message when a merge conflict is detected in a YAML file. This fixes issue #69.
Added this enhancement to the changelog.
Use generic Exception to make tests pass consistently.
Merge pull request #100 from luisdelarosa/check_for_merge_commits_in_yaml_squashed

Show informative error message when a merge conflict is detected in a YAML file.