Add a few XFail tests that point out various problems with merging and symlinks.  This is part of issue #2530.
Add a few XFail tests that point out various problems with merging and
symlinks.  This is part of issue #2530.

* subversion/tests/cmdline/special_tests.py
  (merge_symlink_into_file, merge_file_into_symlink): New tests.
  (test_list): Add new XFail tests, Skipped on non-posix platforms.


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

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