* subversion/libsvn_wc/update_editor.c
  (complete_conflict): Rename parameter 'kind' to 'local_kind' and document
   its intended purpose in the docstring.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1429861 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/conflicts.c
  (setup_tree_conflict_desc): Ask question in a comment.


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