mercurial/commands.py
changeset 2732 42a02b5773d4
parent 2718 a593813241e5
child 2735 eb1bde9560bc
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1751,7 +1751,7 @@ def import_(ui, repo, patch1, *patches, 
             if user:
                 ui.debug('From: %s\n' % user)
             diffs_seen = 0
-            ok_types = ('text/plain', 'text/x-patch')
+            ok_types = ('application/x-patch', 'text/plain', 'text/x-patch')
             for part in msg.walk():
                 content_type = part.get_content_type()
                 ui.debug('Content-Type: %s\n' % content_type)