Remove windows end of line from test case diff output

A ^M was being read into the diff output at the end of each line as
part of the test case.  That ^M caused test_show_revision_for_merge to
fail in the JGit implementation on Windows.