Fix merge / manual conflict resolution artifacts.
Fix merge / manual conflict resolution artifacts.

* subversion/libsvn_fs_util/caching.c
  (cache_settings): add missing "#endif"
  (svn_fs__get_global_membuffer_cache): fix parameters and "volatile" usage

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion