* 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: https://svn.apache.org/repos/asf/subversion/trunk@1570669 13f79535-47bb-0310-9956-ffa450edef68