Mercurial > public > mercurial-scm > hg-stable
diff mercurial/patch.py @ 51875:454feddab720
brancing: merge stable into default
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 06 Sep 2024 02:12:19 +0200 |
parents | ca7bde5dbafb 8f629783b8ae |
children | f4733654f144 |
line wrap: on
line diff
--- a/mercurial/patch.py Wed Aug 28 23:25:26 2024 +0200 +++ b/mercurial/patch.py Fri Sep 06 02:12:19 2024 +0200 @@ -122,7 +122,7 @@ if not m.is_multipart(): yield msgfp(m) else: - ok_types = (b'text/plain', b'text/x-diff', b'text/x-patch') + ok_types = ('text/plain', 'text/x-diff', 'text/x-patch') for part in m.walk(): ct = part.get_content_type() if ct not in ok_types: