amcgregor/snippits — pull request #3 by juliengrenier (2012-08-01 19:29:28+00:00)
Title: Add checks for git conflict markers

Check for the presence of lines containing git conflict markers