Add new merge test for issue #3514 'svn merge --accept [ base | theirs-full ] doesn't work'.
Add new merge test for issue #3514 'svn merge --accept [ base | theirs-full ]
doesn't work'.

* subversion/tests/cmdline/merge_tests.py
  (merge_automatic_conflict_resolution): New test.

  (test_list): Add XFailing merge_automatic_conflict_resolution.

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