diff -r 7bc33d677c0c -r 463df2986814 mercurial/patch.py --- a/mercurial/patch.py Sat Mar 03 09:35:59 2018 -0500 +++ b/mercurial/patch.py Sat Mar 03 14:21:47 2018 -0500 @@ -1852,7 +1852,7 @@ for x in iter(lr.readline, ''): if state == BFILE and ( - (not context and x[0] == '@') + (not context and x.startswith('@')) or (context is not False and x.startswith('***************')) or x.startswith('GIT binary patch')): gp = None