* subversion/libsvn_delta/diff_file.c
* subversion/libsvn_delta/diff_file.c

  (svn_diff3__file_output_line): Use memchr instead of strchr so we don't
    crash when merging binary files (shouldn't happen in the first place,
    but hey, who knows).  Also update the eol logic now we are not using
    a '\n' sentinel.
      
  (svn_diff3_file_output): Stop reserving an extra byte of memory and writing
    a '\n' sentinel in that byte.  mmap the files if we have mmap available.


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

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