Cosmetic tweaks for the interactive merge tool side-by-side display.
Cosmetic tweaks for the interactive merge tool side-by-side display.

* subversion/svn/file-merge.c
  (prepare_line_for_display): Always use the LINE_DISPLAY_WIDTH constant
    directly, rather than an intermediate local variable.
    Fix an off-by-one bug that prevented us from properly chopping newlines
    off lines that contain only a newline.
  (SEP_STRING): Adjust length of each segment to actual line display length.
  (merge_chunks): Stop displaying extra blanks to use as much screen estate
   as possible.


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

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