# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1497362554 14400
# Node ID ff02bb5979c1455b240bb8229f57f08f504af460
# Parent  6675d23da74855a350a8b2dc54166d0b345576da# Parent  efebc9f52ecbbbe90fcb83c6a6202f2ec948bbc5
merge with stable

diff -r 6675d23da748 -r ff02bb5979c1 mercurial/help/patterns.txt
--- a/mercurial/help/patterns.txt	Mon Jun 12 17:24:10 2017 +0200
+++ b/mercurial/help/patterns.txt	Tue Jun 13 10:02:34 2017 -0400
@@ -58,7 +58,8 @@
   *.c            any name ending in ".c" in the current directory
   **.c           any name ending in ".c" in any subdirectory of the
                  current directory including itself.
-  foo/*          any file in directory foo plus all its subdirectories,
+  foo/*          any file in directory foo
+  foo/**         any file in directory foo plus all its subdirectories,
                  recursively
   foo/*.c        any name ending in ".c" in the directory foo
   foo/**.c       any name ending in ".c" in any subdirectory of foo