treeconflicts patch: cosmetic: another missing separator line.

On the tree-conflicts branch only.

[[[
* subversion/tests/cmdline/merge_tests.py: Add a missing
    separator line.
]]]

Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 32607)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -12809,6 +12809,7 @@
   os.chdir(saved_cwd)

+#----------------------------------------------------------------------
 # Helper for text output.
 def verify_lines(lines, regexes):
   """Return True if each of the given regular expressions matches

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194