Author: stsp
Date: Mon Jun 13 23:56:53 2011
New Revision: 1135343
URL: http://svn.apache.org/viewvc?rev=1135343&view=rev
Log:
Follow-up to r1135340:
* subversion/tests/cmdline/merge_tests.py
(property_merge_undo_redo): Add a missing newline to expected output.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1135343&r1=1135342&r2=1135343&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Jun 13
23:56:53 2011
@@ -3083,7 +3083,7 @@ def property_merge_undo_redo(sbox):
expected_disk.add({'A/B/E/alpha.prej'
: Item("Trying to add new property 'foo'\n"
+ "but the property has been locally deleted.\n"
- + "Incoming property value:\nfoo_val")})
+ + "Incoming property value:\nfoo_val\n")})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
expected_status.tweak('A/B/E/alpha', status=' C')
