* subversion/svn/file-merge.c   (LINE_DISPLAY_WIDTH): Increase to fill 78 columns.   (SEP_STRING): Adjust to match above change.
* subversion/svn/file-merge.c
  (LINE_DISPLAY_WIDTH): Increase to fill 78 columns.
  (SEP_STRING): Adjust to match above change.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion