Mercurial > hg-stable
changeset 10744:d794ea113834
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 19 Mar 2010 16:05:16 -0500 |
| parents | 5303b56eabc9 (current diff) 0e8403f4ce31 (diff) |
| children | 16b9aa398c28 |
| files | mercurial/patch.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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')