author | Benoit Allard <benoit@aeteurope.nl> |
Tue, 29 Nov 2011 19:51:35 +0100 | |
branch | stable |
changeset 15582 | 3da1f60fc80d |
parent 15579 | 6c5e6ebe0812 |
child 15591 | 97fc5eec3f43 |
child 15593 | f9c6a575baa4 |
--- a/mercurial/patch.py Thu Nov 24 17:54:50 2011 +0900 +++ b/mercurial/patch.py Tue Nov 29 19:51:35 2011 +0100 @@ -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 '+-':