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
/
scripts
/
0000-Basic
/
0630
diff --git
a/test/scripts/0000-Basic/0630
b/test/scripts/0000-Basic/0630
index b5a7c1e8dc94a50752be457ca495cb8bfd578e75..7228d94c44ce4c79634b6b2043a14f8a136926b9 100644
(file)
--- a/
test/scripts/0000-Basic/0630
+++ b/
test/scripts/0000-Basic/0630
@@
-10,6
+10,7
@@
EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<test_3@paniclogrouter>
??? 250
@@
-25,6
+26,6
@@
QUIT
#
killdaemon
#
-c
p DIR/spool/log/serverdebuglog_router DIR/bin.sys/stder
r
+c
at2 DIR/spool/log/serverdebuglog_route
r
#
no_msglog_check