Follow-up to r1836972: Fix accidental test fallout.
* subversion/tests/cmdline/tree_conflict_tests.py
(ensure_tree_conflict): Pass --accept=postpone to 'svn merge' to override
the conflict resolver and get the behaviour these tests are expecting.
@@ -473,6 +473,7 @@ def ensure_tree_conflict(sbox, operation,
run_and_verify_svn(expected_stdout, [],
'merge',
'--allow-mixed-revisions',
+ '--accept=postpone',
'-r', str(source_left_rev) + ':' + str(source_right_rev),
source_url, target_path)
else:
