* subversion/svn/conflict-callbacks.c   (handle_text_conflict): Don't allow diffs for binary files.    This restores the 'mine-full' and 'theirs-full' options for binary files,    which since r1667228 had no options other than 'edit' and 'postpone'.
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Don't allow diffs for binary files.
   This restores the 'mine-full' and 'theirs-full' options for binary files,
   which since r1667228 had no options other than 'edit' and 'postpone'.


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

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