git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix mismerge
[exim.git]
/
test
/
mail
/
0023.cond-
diff --git
a/test/mail/0023.cond-
b/test/mail/0023.cond-
index 8fd4eacf76bf840c3b3671d17f86a501bf3663ed..ae44bdca545ea5fa8160747bbb77de16250a5e02 100644
(file)
--- a/
test/mail/0023.cond-
+++ b/
test/mail/0023.cond-
@@
-2,7
+2,7
@@
From userx@test.ex Tue Mar 02 09:44:33 1999
Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@test.ex>)
- id 10HmbF-000
5vi-
00
+ id 10HmbF-000
000005vi-00
00
for cond-@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
X-message-body-size: 0