From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 31 Oct 2019 14:18:44 +0000 (-0400)
Subject: Merge branch 'ondrej/update-git-replay-merge' into 'master'
X-Git-Tag: v9.15.6~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ed9396597cac9ba0e2ad4a2b1149a6d30333dc;p=thirdparty%2Fbind9.git

Merge branch 'ondrej/update-git-replay-merge' into 'master'

Update the git-replay-merge to use the latest GitLab -o options

See merge request isc-projects/bind9!2503
---

b7ed9396597cac9ba0e2ad4a2b1149a6d30333dc