Followup to r17645 : Add a new test to validate that conflict markers now match the file's eol style, reported as issue 1325. Do the test for native, CR, LF and CRLF eol styles.
Followup to r17645 : Add a new test to validate that conflict markers
now match the file's eol style, reported as issue 1325. Do the test
for native, CR, LF and CRLF eol styles.

* subversion/tests/cmdline/update_tests.py
  (conflict_markers_matching_eol): New test
  (test_list): Run the conflict_markers_matching_eol test.

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