XFail test to prove issue #2969
XFail test to prove issue #2969

See http://subversion.tigris.org/issues/show_bug.cgi?id=2969

* subversion/tests/cmdline/merge_tests.py
  (propchange_of_subdir_raises_conflict): New function.
  (test_list): Add 'propchange_of_subdir_raises_conflict' to test_list
   as XFail test.

Patch by: Senthil Kumaran <senthil@collab.net>
Suggested by: me


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

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