Issues with Line Endings (^M in Git Diff)

Every once in a while, when I run git diff on a file, I see something like the following: I've made a couple changes to some »