Follow up to r1880192: Fix an EOL issue in test on Windows. * subversion/tests/cmdline/merge-tests.py (merge_deleted_folder_with_mergeinfo_2): Use os.linesep instead of '\n' in expected values of svn:mergeinfo.
subversion/trunk/subversion/tests/cmdline/merge_tests.py