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
SRS: fix mismerge
[exim.git]
/
test
/
log
/
0564
diff --git
a/test/log/0564
b/test/log/0564
index dbaac4b92b52460156ea5d620854171eb07fa37d..9b870da65377e21e7d960f6ed14cca83e697aacc 100644
(file)
--- a/
test/log/0564
+++ b/
test/log/0564
@@
-1,2
+1,2
@@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=p
ppp
, launched with listening socket, with no wait timeout
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p
1234
, launched with listening socket, with no wait timeout
1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss