From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Apr 2016 21:36:34 +0000 (+0100)
Subject: Use file URLs when merging replication diffs
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c3b7d202cd2e99de4577a2b1ab7ca34508928511?ds=sidebyside;hp=c3b7d202cd2e99de4577a2b1ab7ca34508928511

Use file URLs when merging replication diffs

This avoids relying on a working web server for the merging and
shoud generally be a more efficient way to do it.
---