* subversion/libsvn_diff/diff_file.c   (output_conflict_with_context): Move the output_marker_eol() call from ...   (output_conflict_with_context_marker): to here.
* subversion/libsvn_diff/diff_file.c
  (output_conflict_with_context): Move the output_marker_eol() call from ...
  (output_conflict_with_context_marker): to here.


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

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