This adds a test for Git Conflict Markers to prevent committing unfinished
merge conflicts. This will find any `<<<<<<< HEAD`/`>>>>>>>` markers
and will fail out with the line of code, filename and line number.