From: NeilBrown <neilb@suse.de>
Date: Tue, 10 Sep 2019 00:45:15 +0000 (+1000)
Subject: Merge pull request #15 from gobenji/master
X-Git-Tag: v1.2~1^2~1
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=e8593dc90ff9a7a2d71ef650f219155e95ff042f;p=wiggle.git

Merge pull request #15 from gobenji/master

Preserve file mode when using doing --merge --replace
---

e8593dc90ff9a7a2d71ef650f219155e95ff042f