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
/
4030
diff --git
a/test/log/4030
b/test/log/4030
index 07838f869a23d611571b6d3acceddb9631fac8b1..08e827a507c1a193ab076193d300381fa0ce77bc 100644
(file)
--- a/
test/log/4030
+++ b/
test/log/4030
@@
-1,6
+1,6
@@
******** SERVER ********
******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=p
ppp
, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p
1234
, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 proxy session: no
1999-03-02 09:44:33 local [127.0.0.1]:1111
1999-03-02 09:44:33 proxy internal []:0
1999-03-02 09:44:33 proxy session: no
1999-03-02 09:44:33 local [127.0.0.1]:1111
1999-03-02 09:44:33 proxy internal []:0