Use the svn_stringbuf_from_file2() function to simplify several checks in the tree conflict resolution tests.
Use the svn_stringbuf_from_file2() function to simplify several checks
in the tree conflict resolution tests.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_move_file_text_merge,
   test_update_incoming_move_file_text_merge,
   test_switch_incoming_move_file_text_merge,
   test_merge_incoming_move_dir, test_merge_incoming_move_dir2,
   test_merge_incoming_move_dir3): As above.


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

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