* subversion/libsvn_wc/adm_ops.c   (svn_wc_delete4): Following up on r1132948 and r1132919, answer my own     question: We can't just remove conflict markers in a keep_local scenario,     as that would remove conflict markers from the wrong directory, in case     we are just changing the casing of a node on a case insensitive filesystem.
* subversion/libsvn_wc/adm_ops.c
  (svn_wc_delete4): Following up on r1132948 and r1132919, answer my own
    question: We can't just remove conflict markers in a keep_local scenario,
    as that would remove conflict markers from the wrong directory, in case
    we are just changing the casing of a node on a case insensitive filesystem.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion