* subversion/libsvn_fs/fs-loader.h   (root_vtable_t): Separate 'merge' and 'get_mergeinfo', which aren't     really related.
* subversion/libsvn_fs/fs-loader.h
  (root_vtable_t): Separate 'merge' and 'get_mergeinfo', which aren't
    really related.


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

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