* subversion/svn/file-merge.c   (get_term_width): Always return at least 80 columns width. Other output    from 'svn' tends to assume at least 80 columns width, too (e.g. the    interactive conflict resolution prompts do).
* subversion/svn/file-merge.c
  (get_term_width): Always return at least 80 columns width. Other output
   from 'svn' tends to assume at least 80 columns width, too (e.g. the
   interactive conflict resolution prompts do).


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

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