# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1269032716 18000
# Node ID d794ea113834ee934e9897ccb6c59ea8ab0926b4
# Parent  5303b56eabc90f1dfb99b68686907a6137a5c634# Parent  0e8403f4ce317c7b68dfa73d0e3aff8b7cb48528
Merge with stable

diff -r 5303b56eabc9 -r d794ea113834 mercurial/patch.py
--- a/mercurial/patch.py	Fri Mar 19 16:04:49 2010 -0500
+++ b/mercurial/patch.py	Fri Mar 19 16:05:16 2010 -0500
@@ -178,8 +178,8 @@
     # (this heuristic is borrowed from quilt)
     diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |'
                         r'retrieving revision [0-9]+(\.[0-9]+)*$|'
-                        r'(---|\*\*\*)[ \t].*?'
-                        r'^(\+\+\+|\*\*\*)[ \t])', re.MULTILINE|re.DOTALL)
+                        r'---[ \t].*?^\+\+\+[ \t]|'
+                        r'\*\*\*[ \t].*?^---[ \t])', re.MULTILINE|re.DOTALL)
 
     fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
     tmpfp = os.fdopen(fd, 'w')