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
/
1101
diff --git
a/test/log/1101
b/test/log/1101
index d239d2cfd7148ee93f61b3d39ae01df29dc827e4..76c80b3074c7999c4a68c665a48129dcd79b240c 100644
(file)
--- a/
test/log/1101
+++ b/
test/log/1101
@@
-1,3
+1,3
@@
******** 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 port PORT_S
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p
1234
, no queue runs, listening for SMTP on port PORT_D port PORT_S