* subversion/tests/libsvn_client/conflicts-test.c   (create_wc_with_add_vs_add_upon_merge_conflict): Rename to ...   (create_wc_with_file_add_vs_file_add_merge_conflict): ... this to prevent    clashes with future similar functions for cases involving directories.   (test_option_merge_incoming_added_file_ignore,    test_option_merge_incoming_added_file_text_merge,    test_option_merge_incoming_added_file_replace,    test_option_merge_incoming_added_file_replace_and_merge): Update callers.
* subversion/tests/libsvn_client/conflicts-test.c
  (create_wc_with_add_vs_add_upon_merge_conflict): Rename to ...
  (create_wc_with_file_add_vs_file_add_merge_conflict): ... this to prevent
   clashes with future similar functions for cases involving directories.
  (test_option_merge_incoming_added_file_ignore,
   test_option_merge_incoming_added_file_text_merge,
   test_option_merge_incoming_added_file_replace,
   test_option_merge_incoming_added_file_replace_and_merge): Update callers.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1740247 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion