Fix a merge / conflict resolution artifact.
Fix a merge / conflict resolution artifact.

* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__try_process_file_contents): actually use the final code
   as was the case on the 10Gb branch

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

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