Rename some resolver tests to indicate the node kind being tested with.
Rename some resolver tests to indicate the node kind being tested with.

* subversion/tests/libsvn_client/conflicts-test.c
  (create_wc_with_incoming_delete_merge_conflict): Rename to...
   create_wc_with_incoming_delete_file_merge_conflict): ... this.
  (test_merge_incoming_delete_ignore): Rename to ...
  (test_merge_incoming_delete_file_ignore): ... this.
  (test_merge_incoming_delete_accept): Rename to ...
  (test_merge_incoming_delete_file_accept): ... this.
  (create_wc_with_incoming_delete_update_conflict): Rename to ...
  (create_wc_with_incoming_delete_file_update_conflict): ... this.
  (test_update_incoming_delete_ignore): Rename to ...
  (test_update_incoming_delete_file_ignore): ... this.
  (test_update_incoming_delete_accept): Rename to ...
  (test_update_incoming_delete_file_accept): .. this.
  (test_funcs): Track renamed tests.


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

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