# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1360841599 0
# Node ID 09f857c44abeb8a194d226c66d8d1778919944ce
# Parent  1a87bd40517cb119414a132c76faaee45eb54a45# Parent  192cebcd59a044b8cedcfe2db0bd0d1b5096186d
Merge with stable

diff -r 1a87bd40517c -r 09f857c44abe tests/run-tests.py
--- a/tests/run-tests.py	Sun Feb 10 01:51:28 2013 +0000
+++ b/tests/run-tests.py	Thu Feb 14 11:33:19 2013 +0000
@@ -541,6 +541,13 @@
 def globmatch(el, l):
     # The only supported special characters are * and ? plus / which also
     # matches \ on windows. Escaping of these caracters is supported.
+    if el + '\n' == l:
+        if os.name == 'nt':
+            # matching on "/" is not needed for this line
+            iolock.acquire()
+            print "\nInfo, unnecessary glob: %s (glob)" % el
+            iolock.release()
+        return True
     i, n = 0, len(el)
     res = ''
     while i < n:
diff -r 1a87bd40517c -r 09f857c44abe tests/test-keyword.t
--- a/tests/test-keyword.t	Sun Feb 10 01:51:28 2013 +0000
+++ b/tests/test-keyword.t	Thu Feb 14 11:33:19 2013 +0000
@@ -528,6 +528,7 @@
   # HG changeset patch
   # User User Name <user@example.com>
   # Date 1 0
+  #      Thu Jan 01 00:00:01 1970 +0000
   # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
   # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
   cndiff