# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1322694939 21600
# Node ID 97fc5eec3f43b76ef9d7e413e8c7e042c09a529f
# Parent  dbdb8aa705030482ca69d4890889d488c7d86c38# Parent  3da1f60fc80d9fca9c32ffd6972bd865b7cb01c6
merge with stable

diff -r dbdb8aa70503 -r 97fc5eec3f43 hgext/largefiles/lfcommands.py
--- a/hgext/largefiles/lfcommands.py	Fri Nov 04 10:18:40 2011 +0100
+++ b/hgext/largefiles/lfcommands.py	Wed Nov 30 17:15:39 2011 -0600
@@ -71,9 +71,7 @@
             lfiles = set()
             normalfiles = set()
             if not pats:
-                pats = ui.config(lfutil.longname, 'patterns', default=())
-                if pats:
-                    pats = pats.split(' ')
+                pats = ui.configlist(lfutil.longname, 'patterns', default=[])
             if pats:
                 matcher = match_.match(rsrc.root, '', list(pats))
             else:
diff -r dbdb8aa70503 -r 97fc5eec3f43 mercurial/patch.py
--- a/mercurial/patch.py	Fri Nov 04 10:18:40 2011 +0100
+++ b/mercurial/patch.py	Wed Nov 30 17:15:39 2011 -0600
@@ -1639,7 +1639,7 @@
                 if line.startswith('@'):
                     head = False
             else:
-                if line and not line[0] in ' +-@':
+                if line and not line[0] in ' +-@\\':
                     head = True
             stripline = line
             if not head and line and line[0] in '+-':
diff -r dbdb8aa70503 -r 97fc5eec3f43 tests/test-lfconvert.t
--- a/tests/test-lfconvert.t	Fri Nov 04 10:18:40 2011 +0100
+++ b/tests/test-lfconvert.t	Wed Nov 30 17:15:39 2011 -0600
@@ -5,7 +5,8 @@
   > graphlog =
   > [largefiles]
   > minsize = 0.5
-  > patterns = **.dat
+  > patterns = **.other
+  >     **.dat
   > EOF
 
 "lfconvert" works