X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/36bee217cba7c61313cce8e4a4a0c477db421dd0..600dc06981df5a906125f8442c36056a117412d4:/test/stderr/0487 diff --git a/test/stderr/0487 b/test/stderr/0487 index 15da5685a..f86b9e3d8 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -171,6 +171,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> journalling userx@test.ex t1 transport returned OK for userx@test.ex post-process userx@test.ex (0) @@ -182,10 +183,10 @@ 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: - userx@test.ex: no retry items -Failed addresses: -Deferred addresses: + Succeeded addresses: + userx@test.ex: no retry items + Failed addresses: + Deferred addresses: end of retry processing DSN: processing router : r1 DSN: processing successful delivery address: userx@test.ex