Adjust the expected merge notification in merge_tests.py 78 to account for a harmless change due to the 'symmetric merge' code: issue #4217.  Remove the XFail.
Adjust the expected merge notification in merge_tests.py 78 to account for a
harmless change due to the 'symmetric merge' code: issue #4217.  Remove the
XFail.

* subversion/tests/cmdline/merge_tests.py
  (dont_merge_revs_into_subtree_that_predate_it): Adjust expectations and
    remove XFail.


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

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