title: What do the different columns (of letters) mean for the svn merge output?
body: <p>The output of SVN merge has 4 columns of letters listed before the file name. I understand the meaning of the letters (mostly) but I can't find any information on the <strong>meanings of the columns</strong> and so only have a vague understanding based on context. <strong>Can anyone point me to the documentation on this?</strong></p>
  
  <p>Based on context I've been able to infer that column:</p>
  
  <ol>
  <li>Is about text changes to a file</li>
  <li>Seems to be related to use of the svn ignore command on a folder (or maybe it's just properties of the file?)</li>
  <li>I've never seen a letter in the third column and hence I have no idea what it means.</li>
  <li>Might be tree conflicts? This is the one I'm mostly worried about because I don't know how to handle it yet.</li>
  </ol>