You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/02/09 00:22:04 UTC
svn commit: r1444282 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: julianfoad
Date: Fri Feb 8 23:22:04 2013
New Revision: 1444282
URL: http://svn.apache.org/r1444282
Log:
* subversion/tests/cmdline/merge_tests.py
(conflict_aborted_mergeinfo_described_partial_merge): Fix a comment typo.
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=1444282&r1=1444281&r2=1444282&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Feb 8 23:22:04 2013
@@ -18212,7 +18212,7 @@ def conflict_aborted_mergeinfo_described
"""Make a local edit to the file at PATH."""
sbox.simple_propset('prop-' + str(rev), val + ' pval ' + str(rev), path)
- # r4 through r13: simple edits
+ # r4 through r10: simple edits
for rev in range(4, 11):
edit_file(trunk_file, rev, 'Edited')
sbox.simple_commit()