Allow resolving conflicts on binary files to the base version, just like text files.
Allow resolving conflicts on binary files to the base version, just like
text files.

* subversion/libsvn_client/conflicts.c
  (binary_conflict_options): Add missing option.


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

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