# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1287611169 -3600
# Node ID 42c5129e9c6611b2ff3368deb4d43728115bf0b9
# Parent  12f6e285e4e7f33b358d1ed2555ab3a454025308# Parent  e5e1c16fe5b7c211276fee63bf2d09ec17d59154
Merge with stable

diff -r 12f6e285e4e7 -r 42c5129e9c66 tests/run-tests.py
--- a/tests/run-tests.py	Thu Oct 14 22:53:17 2010 +0200
+++ b/tests/run-tests.py	Wed Oct 20 22:46:09 2010 +0100
@@ -546,6 +546,8 @@
 
             if el == l: # perfect match (fast)
                 postout.append("  " + l)
+            elif el and el.decode('string-escape') == l:
+                postout.append("  " + el)  # \-escape match
             elif (el and
                   (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', l) or
                    el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', l))):