Fix mismerge

[exim.git] / test / stderr / 0130

diff --git a/test/stderr/0130 b/test/stderr/0130
index 5dbcd3e4beccfbb100c610608d87908b37ed287b..042d19eb8d438a5c47619cfeca723a615adb8fac 100644 (file)
--- a/test/stderr/0130
+++ b/test/stderr/0130
@@ -11,17 +11,19 @@
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 21)
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 21)
 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@not.test.ex
->>> not.test.ex in "! +local_domains"?
->>>  list element: ! +local_domains
->>>  not.test.ex in "test.ex"?
->>>   list element: test.ex
->>>  not.test.ex in "test.ex"? no (end of list)
->>> not.test.ex in "! +local_domains"? yes (end of list)
+>>> not.test.ex in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>    not.test.ex in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    not.test.ex in "test.ex"? no (end of list)
+>>>   end sublist local_domains
+>>> not.test.ex in domains? yes (end of list)
 >>> calling islocal router
 >>> not.test.ex in "*"?
 >>>  list element: *
@@ -35,7 +37,7 @@ LOG: remote host address is the local host: not.test.ex (while verifying <userx@
 >>> islocal router: defer for userx@not.test.ex
 >>>   message: remote host address is the local host
 >>> ----------- end verify ------------
->>> deny: condition test deferred in ACL "check_recipient"
+>>> deny: condition test deferred in ACL check_recipient
 LOG: H=(test) [V4NET.0.0.0] F=<userx@test.ex> temporarily rejected RCPT <userx@not.test.ex>: remote host address is the local host
 LOG: MAIN
   remote host address is the local host: not.test.ex (while routing <userx@not.test.ex>)