Add a basic test for svn_fs_merge.  The interesting, complicated cases are being tested through the respective commit test cases.
Add a basic test for svn_fs_merge.  The interesting, complicated cases are
being tested through the respective commit test cases.

* subversion/tests/libsvn_fs/fs-test.c
  (test_fs_merge): New test case.
  (test_funcs): Register new test case.

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

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