* subversion/tests/libsvn_fs/fs-test.c   (merging_commit): Followup to r15569: Fix the expectation on the XFail'ing     fs-test 18.   (test_funcs): Mark test as passing.
* subversion/tests/libsvn_fs/fs-test.c
  (merging_commit): Followup to r15569: Fix the expectation on the XFail'ing
    fs-test 18.
  (test_funcs): Mark test as passing.


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

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