Rename 'action' and 'reason' fields in svn_wc_conflict_description3_t
to 'incoming_change' and 'local_change', respectively. The new names
make it more apparent whether a given change was made in the source
or the target of an operation, especially with tree conflicts.

No functional change.

* subversion/include/svn_wc.h
  (svn_wc_conflict_description3_t): Rename 'action' to 'incoming_change'
   and 'reason' to 'local_change'. Enhance related documentation.

* subversion/libsvn_client/merge.c
  (record_tree_conflict, merge_file_opened, merge_dir_opened): Track renames.

* subversion/libsvn_wc/conflicts.c
  (generate_propconflict, read_tree_conflict_desc,
   read_prop_conflict_descs): Track renames.

* subversion/libsvn_wc/entries.c
  (write_entry): Track rename.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__deserialize_conflict, svn_wc__serialize_conflict,
   svn_wc__add_tree_conflict): Track renames.

* subversion/libsvn_wc/upgrade.c
  (svn_wc__upgrade_conflict_skel_from_raw): Track renames.

* subversion/libsvn_wc/util.c
  (svn_wc_conflict_description_create_text3, svn_wc__cd3_to_cd2): Track renames.

* subversion/tests/libsvn_wc/conflict-data-test.c
  (compare_conflict, tree_conflict_create, test_deserialize_tree_conflict,
   test_serialize_tree_conflict_data): Track renames.

* tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
  (raise_tree_conflict): Track renames.


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