title: What are these ^M's that keep showing up in my files in emacs?
body: <p>So I think it may have to do with textmate, but we work in a small team and are having some issues with full-file conflicts of nearly identical files in git because each line of one branch has a ^M appended to it.</p>
  
  <p>What is this mysterious <code>^M</code> character supposed to do, and where could it be coming from? </p>
  
  <p>Our developers use emacs on Windows/Mac, TextMate on Mac, coda on Mac, and occasionally the wp-admin text editor.</p>
  
  <p>Anybody ever have this issue stemming from one of those?</p>