Follow-up to r1687290: Fix more test fallout.
Follow-up to r1687290: Fix more test fallout.

* subversion/svn/info-cmd.c
  (print_info) Don't use svn_client_conflict_text_get_contents() with non-text
   conflicts.


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

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