# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1326205429 -3600
# Node ID e859e80944d0481abb6944d75dfa76e70a656258
# Parent  94a4748db392c2bd03b05db64151fe7bea8bd102# Parent  8b611944eb84447e9d673a076c1dd7b5a729b27d
merge with stable

diff -r 94a4748db392 -r e859e80944d0 mercurial/help/filesets.txt
--- a/mercurial/help/filesets.txt	Sat Jan 07 17:03:33 2012 +0100
+++ b/mercurial/help/filesets.txt	Tue Jan 10 15:23:49 2012 +0100
@@ -52,7 +52,7 @@
 
 - Find C files in a non-standard encoding::
 
-    hg locate "set:**.c and not encoding(ascii)"
+    hg locate "set:**.c and not encoding('UTF-8')"
 
 - Revert copies of large binary files::