title: SVN Update adds ^M when conflicts?
body: <p>We've been working on some files at the same time.  Occasionally, when we "svn up" we'll see files with "^M"'s appended to every line of certain files.  We originally blamed each other's editors >_>.  </p>
  
  <p>We have since narrowed it down to "svn up"ing when conflicts exist.  If we isolate the conflicted file and svn no "^M"'s appear.  No "^M"'s appear in the svn log/diff's.  Its totally weird, right?</p>
  
  <p>Was hoping that someone might have seen this before and know a workaround.  IDK, it might not be reproducible on someone else's setup.  We're using Subversion 1.4.4 if that helps.</p>
  
  <p>Thanks for reading and I appreciate any comments.  </p>