Fix mismerge

[exim.git] / test / stderr / 0020

diff --git a/test/stderr/0020 b/test/stderr/0020
index 5e9e4259f25855880548dc8423e439f409be9f23..7d38f3778f2ffa65339bc4321b111a72d2b6fca3 100644 (file)
--- a/test/stderr/0020
+++ b/test/stderr/0020
@@ -3,8 +3,12 @@
 >>>  list element: 10.250.104.0/21
 >>>  host in host_lookup? yes (matched "10.250.104.0/21")
 >>> looking up host name for 10.250.104.42
->>> IP address lookup yielded "manyhome.test.ex"
->>> checking addresses for manyhome.test.ex
+>>>  IP address lookup yielded "manyhome.test.ex"
+>>>  check dnssec require list
+>>>   manyhome.test.ex not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   manyhome.test.ex not in empty list (option unset? cannot trace name)
+>>>  checking addresses for manyhome.test.ex
 >>>   10.250.107.163
 >>>   10.250.109.49
 >>>   10.250.105.65
@@ -583,10 +587,10 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> processing ACL check_connect "accept" (TESTSUITE/test-config 24)
 >>> check hosts = 10.250.104.0/21
 >>> host in "10.250.104.0/21"?
 >>>  list element: 10.250.104.0/21
 >>>  host in "10.250.104.0/21"? yes (matched "10.250.104.0/21")
->>> accept: condition test succeeded in ACL "check_connect"
->>> end of ACL "check_connect": ACCEPT
+>>> accept: condition test succeeded in ACL check_connect
+>>> end of ACL check_connect: ACCEPT