Use git diff instead of diff in tests
Use git diff instead of diff in tests

Windows doesn't have diff, but it must have git diff, otherwise how did
the user run the previous steps?

Minoru/git-submerge