Add a minaccept to look for conflict remnants

[Aaron Wells]

Sometimes when you do a git merge, conflict resolution diff elements can slip through the cracks of your merge resolution and get commit. They tend to look like this:

<<<<<<< HEAD
(code here)
||||||| parent of 95ef242... More fixes for @failed - getting the select2 ajax to run
(more code here)
=======
(yet more code here)
>>>>>>> 95ef242... More fixes for @failed - getting the select2 ajax to run

You might not have all three code blocks unless you've turned on the three-way diff setting in Git. Our minaccept will usually notice these when they're in a PHP file because they are syntax errors, but they don't get detected if they're in other types of files. So we should just have minaccept look for those sequences of seven of these characters: <, >, |, or =. And if it finds that, it rejects the commit.