Make 'git test fail' more tolerant of bad merges/rebases.

If a 'test start' merge fails then fail can now just reset
without having to run 'git merge --abort'.
Refs #6964