Following up on r1432470, tweak xml output a bit.

* subversion/svn/cl-conflicts.c
  (svn_cl__append_conflict_info_xml): Use argument name 'type' to avoid
    confusion with the 'kind' argument for tree conflicts. Add the operation.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1432604 13f79535-47bb-0310-9956-ffa450edef68