Fix spurious failure in test for issue #3514, this issue has been fixed for some time.
Fix spurious failure in test for issue #3514, this issue has been fixed for
some time.

* subversion/tests/cmdline/merge_tests.py

  (merge_automatic_conflict_resolution): Remove local mod to merge target
   in final merge --accept=base portion of test, this has nothing to do with
   what is being tested here.  Remove comments about failure status.  Change
   expectation of base value in final merge to be that of the merge source's
   base (see http://subversion.tigris.org/issues/show_bug.cgi?id=3514#desc3).

  (test_list): Remove XFail from merge_automatic_conflict_resolution.


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

wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion