changeset 32811:ff02bb5979c1

merge with stable
author Augie Fackler <augie@google.com>
date Tue, 13 Jun 2017 10:02:34 -0400
parents 6675d23da748 (current diff) efebc9f52ecb (diff)
children add613cddcb6
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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