# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1154372533 25200
# Node ID a31f0f2997e90d95db7d089551568a4a7a1ff653
# Parent  2f13f8d3fe8082b8bee20a3884d73e4597821550
import: switch from application/x-patch to text/x-diff
christian ebert says his mailer was broken.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1777,7 +1777,7 @@ def import_(ui, repo, patch1, *patches, 
             if user:
                 ui.debug('From: %s\n' % user)
             diffs_seen = 0
-            ok_types = ('application/x-patch', 'text/plain', 'text/x-patch')
+            ok_types = ('text/plain', 'text/x-diff', 'text/x-patch')
             for part in msg.walk():
                 content_type = part.get_content_type()
                 ui.debug('Content-Type: %s\n' % content_type)