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.
I would just google it, but since google searches strip special characters like ^ I am coming to you guys for help on this.
What is this mysterious ^M character supposed to do, and where could it be coming from? Our developers use emacs on windows/mac, textmate on mac, coda on mac, and occasionally the wp-admin text editor...anybody ever have this issue stemming from one of those?