New tests for testing eol-style handling during merges. Both
tests were copied from update_tests.py and adapted (updates
replaced by merge).
* subversion/tests/cmdline/tests/merge_tests.py
(merge_conflict_markers_matching_eol): New test, checks
the eol-style of the conflict files.
(merge_eolstyle_handling): New test, checks if merge handles
and propchanges of svn:eol-style correctly during merge.
This test is marked XFail for now
(test_list): add the two new tests.
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@861354 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
