X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/36bee217cba7c61313cce8e4a4a0c477db421dd0..f3ee1d51e03bdbe50a12385a7ff1098684edcaa2:/test/stderr/2600?ds=sidebyside diff --git a/test/stderr/2600 b/test/stderr/2600 index 5a88b759c..5b8d97e38 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -669,6 +669,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=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> journalling userx@myhost.test.ex t1 transport returned OK for userx@myhost.test.ex post-process userx@myhost.test.ex (0) @@ -680,10 +681,10 @@ changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1239 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items -Succeeded addresses: - userx@myhost.test.ex: no retry items -Failed addresses: -Deferred addresses: + Succeeded addresses: + userx@myhost.test.ex: no retry items + Failed addresses: + Deferred addresses: end of retry processing DSN: processing router : r1 DSN: processing successful delivery address: userx@myhost.test.ex