Fix Failure Message For Merge Conflicts

The error message for tests that already failed due to merge
messages gave the false impression the branch the commit
should have been merged to would cause the error.
This change now pulls the informations out of the sha
of the commit that gets tested.