Finally close issue #1150:
Finally close issue #1150:

* subversion/tests/clients/cmdline/merge_tests.py
  (merge_one_file): Remove comments related to expected failure.
  (test_list): Run merge_one_file.



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

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