Fix mismerge

[exim.git] / test / stdout / 0542

diff --git a/test/stdout/0542 b/test/stdout/0542
index 6a860f0d96413c88854f433033474af754b49756..49f1533762fc204e0739505f5b06e9638be8b1d5 100644 (file)
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -1,23 +1,26 @@
-> From: Himself <himself@there.tld>
-> Subject: The subject is not the object
+> from: Himself <himself@there.tld>
+> subject: The subject is not the object
 > message_body_size=71
-> message_id=10HmaX-0005vi-00
-> message_exim_id=10HmaX-0005vi-00
+> message_id=10HmaX-000000005vi-0000
+> message_exim_id=10HmaX-000000005vi-0000
 > max_received_linelength=70
 > recipients=userx@test.x, usery@test.ex
+> Defined macro 'TESTING_MACROS'
+> (userx@test.x, usery@test.ex)
 > 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello CALLER at test\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
-> From: Himself <himself@there.tld>
-> Subject: The subject is not the object
+> from: Himself <himself@there.tld>
+> subject: The subject is not the object
 > message_body_size=76
-> message_id=10HmaY-0005vi-00
-> message_exim_id=10HmaY-0005vi-00
+> message_id=10HmaY-000000005vi-0000
+> message_exim_id=10HmaY-000000005vi-0000
 > max_received_linelength=75
 > recipients=userx@test.x, usery@test.ex
 > 
@@ -25,16 +28,16 @@
 > to: First <first@test.ex>, Second <second@test.ex>
 > subject: The subject is moot
 > message_body_size=77
-> message_exim_id=10HmaZ-0005vi-00
+> message_exim_id=10HmaZ-000000005vi-0000
 > message_linecount=6
 > message_body_linecount=2
 > max_received_linelength=50
 > headers -----------------
-> Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-From: A Person <a.person@a.domain.tld>
+> From: A Person <a.person@a.domain.tld>
 To: First <first@test.ex>, Second <second@test.ex>
 Subject: The subject is moot
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 > 
 > body --------------------
 > And now we have the body of the message, containing a small number of lines.