* subversion/tests/cmdline/merge_tests.py   (merge_replace_causes_tree_conflict2, merge_replace_causes_tree_conflict3):     Add two tests, related to tree-conflicts during replace,     both marked XFail.
* subversion/tests/cmdline/merge_tests.py
  (merge_replace_causes_tree_conflict2, merge_replace_causes_tree_conflict3):
    Add two tests, related to tree-conflicts during replace,
    both marked XFail.


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

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