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 m
By experimentation, the C's that shows up in the 3rd column in svn merge correspond to the C's that show up in the 7th column when I do an svn status. So, a C in the 3rd column from the merge command must correspond to the item being the victim of a tree conflict.