Makes merge markers a warning
Fixes line-ending errors not aborting commit
check_commit() now also counts warnings