Put a tiny bit more structure into the Python tests: get the expected text
for a summary of conflicts from the new summary_of_conflicts() function.

* subversion/tests/cmdline/basic_tests.py
  (basic_update): As above.

* subversion/tests/cmdline/merge_tests.py
  (merge_target_selection): Same.

* subversion/tests/cmdline/patch_tests.py
  (patch_absolute_paths,
   patch_add_new_dir,
   patch_reject,
   patch_same_twice,
   patch_dir_properties,
   patch_delete_and_skip,
   single_line_mismatch): Same.

* subversion/tests/cmdline/stat_tests.py
  (status_add_plus_conflict,
   status_with_tree_conflicts): Same.

* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour): Same.

* subversion/tests/cmdline/update_tests.py
  (update_output_with_conflicts, update_output_with_conflicts_resolved):
    New functions, using summary_of_conflicts().
  (update_accept_conflicts): Use them.


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