# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1247222424 -7200
# Node ID 671543b933458cba778486b0047d29c5ebede90d
# Parent  c50f56b5f4b865c21f0b397869b4a4e79b8692cb# Parent  6bbf554beea25577679ef04dda0a4d16af833253
Merge with stable

diff -r c50f56b5f4b8 -r 671543b93345 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Jul 09 11:59:12 2009 +0200
+++ b/hgkw/keyword.py	Fri Jul 10 12:40:24 2009 +0200
@@ -45,8 +45,8 @@
     **.py =
     x*    = ignore
 
-Note: the more specific you are in your filename patterns the less you lose
-      speed in huge repositories.
+NOTE: the more specific you are in your filename patterns the less you lose
+speed in huge repositories.
 
 For [keywordmaps] template mapping and expansion demonstration and control run
 "hg kwdemo".
diff -r c50f56b5f4b8 -r 671543b93345 tests/test-keyword.out
--- a/tests/test-keyword.out	Thu Jul 09 11:59:12 2009 +0200
+++ b/tests/test-keyword.out	Fri Jul 10 12:40:24 2009 +0200
@@ -18,8 +18,8 @@
     **.py =
     x*    = ignore
 
-Note: the more specific you are in your filename patterns the less you lose
-      speed in huge repositories.
+NOTE: the more specific you are in your filename patterns the less you lose
+speed in huge repositories.
 
 For [keywordmaps] template mapping and expansion demonstration and control run
 "hg kwdemo".