* subversion/tests/cmdline/resolve_tests.py   (automatic_binary_conflict_resolution): Mark test XFail and extend test     to show that my patch that I handed luke1410 is not good enough.
* subversion/tests/cmdline/resolve_tests.py
  (automatic_binary_conflict_resolution): Mark test XFail and extend test
    to show that my patch that I handed luke1410 is not good enough.


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

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