Author: hwright Revision: 860425 Modified property: svn:log Modified: svn:log at Mon Nov 30 20:49:27 2009 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Mon Nov 30 20:49:27 2009 @@ -1,7 +1,7 @@ Followup to r20350: Test the actual content of the left, right and mine files to see if they have the correct eol style. -Suggested by: dionisos +Suggested by: ehu * subversion/tests/cmdline/update_tests.py (conflict_markers_matching_eol): validate the expected content of