From: Witold Krecicki <wpk@isc.org>
Date: Mon, 10 Jun 2019 14:51:01 +0000 (-0400)
Subject: Merge branch 'wpk/git-replay-merge-worktrees' into 'master'
X-Git-Tag: v9.15.1~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90ff5a551aa6ba4340ae45f6ff3a97b3141d8b5c;p=thirdparty%2Fbind9.git

Merge branch 'wpk/git-replay-merge-worktrees' into 'master'

util/git-replay-merge.sh: make the tool compatible with git worktrees

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

90ff5a551aa6ba4340ae45f6ff3a97b3141d8b5c