Fix broken tests in mingwGitDevEnv

These tests were broken when updating to the latest version of
Git on msysgit.  Some simple changes back to test_cmp should fix
them.