From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 May 2017 07:52:02 +0000 (+0100)
Subject: Try diff merging several times at five minute intervals
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/0caa63bd97d580dcea96abe98cf82d993311c61f?hp=0caa63bd97d580dcea96abe98cf82d993311c61f

Try diff merging several times at five minute intervals

This way if the underlying diffs are ready yet we will have another
go later, and extra ones are harmless as they do nothing.
---