# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1289298714 0
# Node ID bbb042e55f49f75086707e87fcc7a4fa8f61fcc5
# Parent  d36150edc23154b19016a59aac2c325538860759# Parent  1ea19e827b5bda840137a223ba56bfae83a9f29b
Merge with stable

diff -r d36150edc231 -r bbb042e55f49 tests/run-tests.py
--- a/tests/run-tests.py	Mon Nov 08 11:11:23 2010 +0000
+++ b/tests/run-tests.py	Tue Nov 09 10:31:54 2010 +0000
@@ -556,8 +556,9 @@
                 postout.append("  " + lout)
             elif (el and
                   (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or
-                   el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)) or
-                   el.endswith(" (esc)\n") and el.decode('string-escape') == l):
+                   el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)
+                   or el.endswith(" (esc)\n") and
+                      el.decode('string-escape') == l)):
                 postout.append("  " + el) # fallback regex/glob/esc match
             else:
                 if needescape(lout):