X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/5bb1dfe41e40fa45f85305ccbd7d4533a229d3fc..600dc06981df5a906125f8442c36056a117412d4:/test/stderr/5004 diff --git a/test/stderr/5004 b/test/stderr/5004 index 57eed3480..dd78e2352 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -157,6 +157,7 @@ renaming temporary file renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> journalling TESTSUITE/test-mail:userx@test.ex t1 transport returned OK for TESTSUITE/test-mail post-process TESTSUITE/test-mail (0) @@ -169,12 +170,12 @@ changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items -Succeeded addresses: - TESTSUITE/test-mail: no retry items - userx@test.ex: no retry items - userx@test.ex: no retry items -Failed addresses: -Deferred addresses: + Succeeded addresses: + TESTSUITE/test-mail: no retry items + userx@test.ex: no retry items + userx@test.ex: no retry items + Failed addresses: + Deferred addresses: end of retry processing DSN: processing router : r1 DSN: processing successful delivery address: TESTSUITE/test-mail