merge with stable

hgext/largefiles/lfcommands.py

@@ -71,9 +71,7 b' def lfconvert(ui, src, dest, *pats, **op'
             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:

mercurial/patch.py

@@ -1639,7 +1639,7 b' def difflabel(func, *args, **kw):'
                 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 '+-':

tests/test-lfconvert.t

@@ -5,7 +5,8 b''
   > graphlog =
   > [largefiles]
   > minsize = 0.5
-  > patterns = **.dat
+  > patterns = **.other
+  >     **.dat
   > EOF
 
 "lfconvert" works