Fix a merge test that is XFailing due to incorrect expectations in the brave new tree conflict world.
Fix a merge test that is XFailing due to incorrect expectations in the
brave new tree conflict world.

* subversion/tests/cmdline/merge_tests.py
  (merge_add_over_versioned_file_conflicts): Expect a tree conflict when
  merging a file addition onto an existing versioned file.
  (test_list): Remove XFail from merge_add_over_versioned_file_conflicts.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion